stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-21 20:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'next' into 'next'

Browse source 
MobjDamage hook tweaks for special stages

Closes #822

See merge request STJr/SRB2!2485
This commit is contained in:
sphere 2024-06-24 22:28:16 +00:00
commit 8b826bb267
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_inter.c
View file

@ -3786,6 +3786,8 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (player->powers[pw_carry] == CR_NIGHTSMODE) // NiGHTS damage handling if (player->powers[pw_carry] == CR_NIGHTSMODE) // NiGHTS damage handling
{ {
if (player->powers[pw_flashing])
return false;
if (!force) if (!force)
{ {
if (source == target) if (source == target)
@ -3803,6 +3805,10 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (G_IsSpecialStage(gamemap) && !(damagetype & DMG_DEATHMASK)) if (G_IsSpecialStage(gamemap) && !(damagetype & DMG_DEATHMASK))
{ {
if (player->powers[pw_flashing])
return false;
if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype))
return true;
P_SpecialStageDamage(player, inflictor, source); P_SpecialStageDamage(player, inflictor, source);
return true; return true;
} }