zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix lava floor and crushing ceilings not damaging the player. Fixes issues #2 and #3

This commit is contained in:
sirlemonhead 2019-09-19 19:29:58 +01:00 committed by Christoph Oelckers
parent bf07930b8c
commit 9d5a6ac807
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/exhumed/src/runlist.cpp
View File

@ -1709,7 +1709,7 @@ void runlist_RadialDamageEnemy(short nSprite, short nDamage, short nRadius)
}
}
void runlist_DamageEnemy(short nSprite, short nSprite2, short nDamage)
void runlist_DamageEnemy(int nSprite, int nSprite2, short nDamage)
{
if (sprite[nSprite].statnum >= kMaxStatus) {
return;
@ -1721,7 +1721,7 @@ void runlist_DamageEnemy(short nSprite, short nSprite2, short nDamage)
return;
}
runlist_SendMessageToRunRec(nRun, nSprite2 | 0x80000, nDamage * 4);
runlist_SendMessageToRunRec(nRun, (nSprite2 & 0xFFFF) | 0x80000, nDamage * 4);
if (nCreaturesLeft <= 0) {
return;

2
source/exhumed/src/runlist.h
View File

@ -55,7 +55,7 @@ void runlist_SubRunRec(int RunPtr);
void runlist_ProcessWallTag(int nWall, short lotag, short hitag);
int runlist_CheckRadialDamage(short nSprite);
void runlist_RadialDamageEnemy(short nSprite, short nDamage, short nRadius);
void runlist_DamageEnemy(short nSprite, short nSprite2, short nDamage);
void runlist_DamageEnemy(int nSprite, int nSprite2, short nDamage);
void runlist_SignalRun(int NxtPtr, int edx);
void runlist_CleanRunRecs();