zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change hard-coded subway effect damage to generic explosive damage that can be handled by CON. Fixes subway kills not counting toward the dead monster count and allows CON scripts to handle subway damage however they like.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6225 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-06-23 03:58:13 +00:00
parent 8cda268514
commit 6319b6fb60
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5607,7 +5607,7 @@ static void MaybeTrainKillPlayer(const spritetype *pSprite, int setOPos)
} }
// i: SE spritenum // i: SE spritenum
static void MaybeTrainKillEnemies(int spriteNum, int numGuts) static void MaybeTrainKillEnemies(int spriteNum)
{ {
int findSprite = headspritesect[sprite[OW(spriteNum)].sectnum]; int findSprite = headspritesect[sprite[OW(spriteNum)].sectnum];
@ -5623,9 +5623,8 @@ static void MaybeTrainKillEnemies(int spriteNum, int numGuts)
if (sectNum == sprite[spriteNum].sectnum) if (sectNum == sprite[spriteNum].sectnum)
{ {
A_DoGutsDir(findSprite, JIBS6, numGuts); actor[findSprite].picnum = RADIUSEXPLOSION;
A_PlaySound(SQUISHED, findSprite); actor[findSprite].extra = g_impactDamage << 10;
A_DeleteSprite(findSprite);
} }
} }
@ -6049,7 +6048,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
if (ud.noclip == 0 && pSprite->xvel >= 192) if (ud.noclip == 0 && pSprite->xvel >= 192)
MaybeTrainKillPlayer(pSprite, 1); MaybeTrainKillPlayer(pSprite, 1);
MaybeTrainKillEnemies(spriteNum, 72); MaybeTrainKillEnemies(spriteNum);
} }
} }
else else
@ -6190,7 +6189,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
if (ud.noclip == 0) if (ud.noclip == 0)
MaybeTrainKillPlayer(pSprite, 1); MaybeTrainKillPlayer(pSprite, 1);
MaybeTrainKillEnemies(spriteNum, 24); MaybeTrainKillEnemies(spriteNum);
} }
} }