zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert tripbomb logic

Browse source
This commit is contained in:
nukeykt 2019-06-22 21:31:28 +09:00 committed by Christoph Oelckers
parent 1fb877445c
commit 6b7245ec97
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/rr/src/actors.cpp
View file

@ -1845,17 +1845,14 @@ ACTOR_STATIC void G_MoveStandables(void)
pSprite->ang = oldAng; pSprite->ang = oldAng;
} }
switch (T1(spriteNum)) if (T1(spriteNum) < 32)
{
default:
{ {
int32_t playerDist; int32_t playerDist;
A_FindPlayer(pSprite, &playerDist); A_FindPlayer(pSprite, &playerDist);
if (playerDist > 768 || T1(spriteNum) > 16) T1(spriteNum)++; if (playerDist > 768 || T1(spriteNum) > 16) T1(spriteNum)++;
break;
} }
case 32: if (T1(spriteNum) == 32)
{ {
int16_t hitSprite; int16_t hitSprite;
int const oldAng = pSprite->ang; int const oldAng = pSprite->ang;
@ -1896,10 +1893,10 @@ ACTOR_STATIC void G_MoveStandables(void)
} }
hitDist -= 1024; hitDist -= 1024;
cursectnum = pSprite->sectnum; //cursectnum = pSprite->sectnum;
updatesector(pSprite->x, pSprite->y, &cursectnum); //updatesector(pSprite->x, pSprite->y, &cursectnum);
if (cursectnum < 0) //if (cursectnum < 0)
break; // break;
} }
T1(spriteNum)++; T1(spriteNum)++;
@ -1916,10 +1913,9 @@ ACTOR_STATIC void G_MoveStandables(void)
T3(spriteNum) = 13; T3(spriteNum) = 13;
A_PlaySound(LASERTRIP_ARMING,spriteNum); A_PlaySound(LASERTRIP_ARMING,spriteNum);
} }
break;
} }
case 33: if (T1(spriteNum) == 33)
{ {
T2(spriteNum)++; T2(spriteNum)++;
@ -1945,8 +1941,6 @@ ACTOR_STATIC void G_MoveStandables(void)
T3(spriteNum) = 13; T3(spriteNum) = 13;
A_PlaySound(LASERTRIP_ARMING, spriteNum); A_PlaySound(LASERTRIP_ARMING, spriteNum);
} }
break;
}
} }
goto next_sprite; goto next_sprite;