Commit e3946bf8 authored by Richard Gobeille's avatar Richard Gobeille

Duke3d: fix GREENSLIME issue introduced by 6335a9a2

parent 1bc4d5fc
......@@ -4754,12 +4754,12 @@ ACTOR_STATIC void G_MoveActors(void)
pSprite->cstat = (playerDist < 1596) ? 0 : 257;
if (pData[0] == GREENSLIME_ONPLAYER && pPlayer->somethingonplayer == spriteNum)
if (pData[0] == GREENSLIME_ONPLAYER)
{
if (sprite[pPlayer->i].extra < 1)
if (sprite[pPlayer->i].extra < 1 && pPlayer->somethingonplayer == spriteNum)
{
pPlayer->somethingonplayer = -1;
pData[0] = GREENSLIME_DONEEATING;
pData[0] = GREENSLIME_TOFLOOR;
goto next_sprite;
}
......@@ -4842,10 +4842,9 @@ ACTOR_STATIC void G_MoveActors(void)
goto next_sprite;
}
else if (pSprite->xvel < 64 && playerDist < 768)
{
if (pPlayer->somethingonplayer == -1)
if (pPlayer->somethingonplayer == -1 && sprite[pPlayer->i].extra > 0)
{
pPlayer->somethingonplayer = spriteNum;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment