stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-07 08:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'nights-nofastattract' into 'master'

Browse source 
NiGHTS: Dummy out faster item attract

See merge request STJr/SRB2Internal!183
This commit is contained in:
Digiku 2018-08-30 17:26:42 -04:00
commit 6ab0eb53f9
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_inter.c
View file

@ -946,7 +946,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
// Yay! The thing's in reach! Pull it in! // Yay! The thing's in reach! Pull it in!
mo2->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT; mo2->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT;
mo2->flags2 |= MF2_NIGHTSPULL; mo2->flags2 |= MF2_NIGHTSPULL;
mo2->movefactor = 32*FRACUNIT; // initialize the NightsItemChase timer // New NiGHTS attract speed dummied out because the older behavior
// is exploited as a mechanic. Uncomment to enable.
mo2->movefactor = 0; // 32*FRACUNIT; // initialize the NightsItemChase timer
P_SetTarget(&mo2->tracer, toucher); P_SetTarget(&mo2->tracer, toucher);
} }
} }

4
src/p_user.c
View file

@ -9807,7 +9807,9 @@ void P_PlayerThink(player_t *player)
// Yay! The thing's in reach! Pull it in! // Yay! The thing's in reach! Pull it in!
mo2->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT; mo2->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT;
mo2->flags2 |= MF2_NIGHTSPULL; mo2->flags2 |= MF2_NIGHTSPULL;
mo2->movefactor = 40*FRACUNIT; // initialize the NightsItemChase timer // New NiGHTS attract speed dummied out because the older behavior
// is exploited as a mechanic. Uncomment to enable.
mo2->movefactor = 0; // 40*FRACUNIT; // initialize the NightsItemChase timer
P_SetTarget(&mo2->tracer, player->mo); P_SetTarget(&mo2->tracer, player->mo);
} }
} }