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

On Rob's request, the twinspin can break spikes. (woo)

Browse source
This commit is contained in:
toasterbabe 2016-07-16 18:54:22 +01:00
parent 21ba204c9e
commit 0f79e9ea3b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_map.c
View file

@ -448,9 +448,12 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; return true;
} }
// Dashmode users destroy spikes and monitors. // CA_DASHMODE users destroy spikes and monitors, CA_TWINSPIN users destroy spikes.
if ((tmthing->player) && (tmthing->player->charability == CA_DASHMODE) && (tmthing->player->dashmode >= 3*TICRATE) if ((tmthing->player)
&& (thing->flags & (MF_MONITOR) || thing->type == MT_SPIKE)) && (((tmthing->player->charability == CA_DASHMODE) && (tmthing->player->dashmode >= 3*TICRATE)
&& (thing->flags & (MF_MONITOR) || thing->type == MT_SPIKE))
|| ((tmthing->player->charability == CA_TWINSPIN) && (tmthing->player->panim == PA_ABILITY)
&& (thing->type == MT_SPIKE))))
{ {
if ((thing->flags & (MF_MONITOR)) && (thing->health <= 0 || !(thing->flags & MF_SHOOTABLE))) if ((thing->flags & (MF_MONITOR)) && (thing->health <= 0 || !(thing->flags & MF_SHOOTABLE)))
return true; return true;