teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-20 18:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- operateTripBomb

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-17 22:47:08 +01:00
parent e88047fc45
commit b97f8706ad
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/duke/src/player_d.cpp
View file

@ -2022,8 +2022,9 @@ int operateTripbomb(int snum)
if (hw >= 0 && sector[sect].lotag > 2)
return 0;
if (hw >= 0 && wall[hw].overpicnum >= 0)
if (wall[hw].overpicnum == BIGFORCE)
auto wal = hw < 0? nullptr : &wall[hw];
if (hw >= 0 && wal->overpicnum >= 0)
if (wal->overpicnum == BIGFORCE)
return 0;
DDukeActor* j;
@ -2036,8 +2037,8 @@ int operateTripbomb(int snum)
return 0;
}
if (j == nullptr && hw >= 0 && (wall[hw].cstat & 16) == 0)
if ((wall[hw].nextsector >= 0 && sector[wall[hw].nextsector].lotag <= 2) || (wall[hw].nextsector == -1 && sector[sect].lotag <= 2))
if (j == nullptr && hw >= 0 && (wal->cstat & 16) == 0)
if ((wal->nextsector >= 0 && wal->nextSector()->lotag <= 2) || (wal->nextsector == -1 && sector[sect].lotag <= 2))
if (((sx - p->pos.x) * (sx - p->pos.x) + (sy - p->pos.y) * (sy - p->pos.y)) < (290 * 290))
{
p->pos.z = p->oposz;