Commit fb350ed2 authored by Dino Bollinger's avatar Dino Bollinger
Browse files

Duke3D: Delete existing dummyplayer sprite if standing on TROR water

Fixes #76 and #91 (for real this time)
parent 348f9f80
......@@ -1293,7 +1293,11 @@ void A_MoveDummyPlayers(void)
int const nextSprite = nextspritestat[spriteNum];
int const playerSectnum = pPlayer->cursectnum;
if (pPlayer->on_crane >= 0 || (playerSectnum >= 0 && sector[playerSectnum].lotag != ST_1_ABOVE_WATER) || sprite[pPlayer->i].extra <= 0)
if (pPlayer->on_crane >= 0 || (playerSectnum >= 0 && sector[playerSectnum].lotag != ST_1_ABOVE_WATER) || sprite[pPlayer->i].extra <= 0
#ifdef YAX_ENABLE
|| yax_getbunch(pPlayer->cursectnum, YAX_FLOOR) >= 0
#endif
)
{
pPlayer->dummyplayersprite = -1;
DELETE_SPRITE_AND_CONTINUE(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