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

Fix player taunt frequency (and there was much rejoicing)

Browse source
This commit is contained in:
sirlemonhead 2019-11-25 11:53:27 +00:00 committed by Christoph Oelckers
parent 979f40f900
commit aba3e85c8e
1 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/exhumed/src/runlist.cpp
View file

@ -1807,17 +1807,17 @@ void runlist_DamageEnemy(int nSprite, int nSprite2, short nDamage)
} }
short nRun = sprite[nSprite].owner; short nRun = sprite[nSprite].owner;
if (nRun <= -1) { if (nRun <= -1) {
return; return;
} }
short nPreCreaturesLeft = nCreaturesLeft;
runlist_SendMessageToRunRec(nRun, (nSprite2 & 0xFFFF) | 0x80000, nDamage * 4); runlist_SendMessageToRunRec(nRun, (nSprite2 & 0xFFFF) | 0x80000, nDamage * 4);
if (nCreaturesLeft <= 0) { // is there now one less creature? (has one died)
return; if (nPreCreaturesLeft > nCreaturesLeft)
} {
if (sprite[nSprite2].statnum != 100) { if (sprite[nSprite2].statnum != 100) {
return; return;
} }
@ -1846,4 +1846,5 @@ void runlist_DamageEnemy(int nSprite, int nSprite2, short nDamage)
nTauntTimer[nPlayer] = RandomSize(3) + 3; nTauntTimer[nPlayer] = RandomSize(3) + 3;
} }
} }
}
END_PS_NS END_PS_NS