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

Merge branch 'firedeath' into 'next'

Browse source 
Fix #214 (Crushstacean + Fireball Player Removal)

Closes #214

See merge request STJr/SRB2!1629
This commit is contained in:
sphere 2021-11-26 14:11:09 +00:00
commit 491ffc7447
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_enemy.c
View file

@ -3518,9 +3518,7 @@ void A_Scream(mobj_t *actor)
if (LUA_CallAction(A_SCREAM, actor))
return;
if (actor->tracer && (actor->tracer->type == MT_SHELL || actor->tracer->type == MT_FIREBALL))
S_StartScreamSound(actor, sfx_mario2);
else if (actor->info->deathsound)
if (actor->info->deathsound && !S_SoundPlaying(actor, sfx_mario2))
S_StartScreamSound(actor, actor->info->deathsound);
}

2
src/p_inter.c
View file

@ -2391,7 +2391,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
mobj_t *mo;
if (inflictor && (inflictor->type == MT_SHELL || inflictor->type == MT_FIREBALL))
P_SetTarget(&target->tracer, inflictor);
S_StartScreamSound(target, sfx_mario2);
if (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap) && target->player && target->player->nightstime > 6)
target->player->nightstime = 6; // Just let P_Ticker take care of the rest.