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

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

Browse source
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) { if (sprite[nSprite].statnum >= kMaxStatus) {
return; return;
@ -1721,7 +1721,7 @@ void runlist_DamageEnemy(short nSprite, short nSprite2, short nDamage)
return; return;
} }
runlist_SendMessageToRunRec(nRun, nSprite2 | 0x80000, nDamage * 4); runlist_SendMessageToRunRec(nRun, (nSprite2 & 0xFFFF) | 0x80000, nDamage * 4);
if (nCreaturesLeft <= 0) { if (nCreaturesLeft <= 0) {
return; 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); void runlist_ProcessWallTag(int nWall, short lotag, short hitag);
int runlist_CheckRadialDamage(short nSprite); int runlist_CheckRadialDamage(short nSprite);
void runlist_RadialDamageEnemy(short nSprite, short nDamage, short nRadius); 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_SignalRun(int NxtPtr, int edx);
void runlist_CleanRunRecs(); void runlist_CleanRunRecs();