stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-21 18:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bumperstuff' into 'master'

Browse source 
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.

Closes #246

See merge request STJr/SRB2Internal!365
This commit is contained in:
MascaraSnake 2019-10-10 02:35:33 -04:00
commit c17a3227a0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_inter.c
View file

@ -1074,7 +1074,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (player->exiting)
return;
if (player->bumpertime < TICRATE/4)
if (player->bumpertime <= (TICRATE/2)-5)
{
S_StartSound(toucher, special->info->seesound);
if (player->powers[pw_carry] == CR_NIGHTSMODE)

2
src/p_map.c
View file

@ -208,7 +208,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
{
angle_t nightsangle = 0;
if (object->player->bumpertime >= TICRATE/4)
if (object->player->bumpertime > (TICRATE/2)-5)
return false;
if ((object->player->pflags & PF_TRANSFERTOCLOSEST) && object->player->axis1 && object->player->axis2)