zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-14 08:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Duke3d: fix GREENSLIME issue introduced by 6335a9a2e515329a159b03ba0c8a32136dc6ac42

Browse source
This commit is contained in:
Richard C. Gobeille 2020-06-11 09:59:27 -07:00 committed by Christoph Oelckers
parent 54d9a1a711
commit 4e9144dd20
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/duke3d/src/actors.cpp
View file

@ -4739,12 +4739,12 @@ ACTOR_STATIC void G_MoveActors(void)
pSprite->cstat = (playerDist < 1596) ? 0 : 257; 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; pPlayer->somethingonplayer = -1;
pData[0] = GREENSLIME_DONEEATING; pData[0] = GREENSLIME_TOFLOOR;
goto next_sprite; goto next_sprite;
} }
@ -4827,10 +4827,9 @@ ACTOR_STATIC void G_MoveActors(void)
goto next_sprite; goto next_sprite;
} }
else if (pSprite->xvel < 64 && playerDist < 768) else if (pSprite->xvel < 64 && playerDist < 768)
{ {
if (pPlayer->somethingonplayer == -1) if (pPlayer->somethingonplayer == -1 && sprite[pPlayer->i].extra > 0)
{ {
pPlayer->somethingonplayer = spriteNum; pPlayer->somethingonplayer = spriteNum;