vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix really dumb flags on MT_SPBEXPLOSION

Browse source
This commit is contained in:
TehRealSalt 2019-01-14 21:55:10 -05:00
parent 4ce528bea7
commit c61fcc8db6
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -15861,7 +15861,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
100, // mass 100, // mass
1, // damage 1, // damage
sfx_None, // activesound sfx_None, // activesound
MF_BOUNCE|MF_FLOAT|MF_NOCLIPTHING|MF_MISSILE|MF_SHOOTABLE|MF_DONTENCOREMAP, // flags MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_DONTENCOREMAP, // flags
S_NULL // raisestate S_NULL // raisestate
}, },

2
src/p_inter.c
View file

@ -588,7 +588,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0) if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0)
{ {
player->powers[pw_flashing] = 0; //player->powers[pw_flashing] = 0;
K_DropHnextList(player); K_DropHnextList(player);
K_StripItems(player); K_StripItems(player);
} }

4
src/p_mobj.c
View file

@ -7441,10 +7441,10 @@ void P_MobjThinker(mobj_t *mobj)
break; break;
case MT_SSMINE: case MT_SSMINE:
case MT_SPBEXPLOSION: case MT_SPBEXPLOSION:
if (mobj->health > -100) if (mobj->extravalue2 != -100)
{ {
P_SetMobjState(mobj, mobj->info->deathstate); P_SetMobjState(mobj, mobj->info->deathstate);
mobj->health = -100; mobj->extravalue2 = -100;
} }
else else
{ {