OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- sanitized the 'frozen level' code.

Browse source 
This had two different flags that were checked totally inconsistently, and one was not even saved.
Moved everything into a few subfunctions so that these checks do not have to be scattered all over the code.
This commit is contained in:
Christoph Oelckers 2019-01-28 20:15:48 +01:00
commit 259ae41774
25 changed files with 124 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/p_tick.cpp
View file

@ -99,6 +99,7 @@ void P_Ticker (void)
{
if (bglobal.changefreeze)
{
level.frozenstate ^= 2;
bglobal.freeze ^= 1;
bglobal.changefreeze = 0;
}
@ -134,8 +135,7 @@ void P_Ticker (void)
P_ThinkParticles(); // [RH] make the particles think
for (i = 0; i<MAXPLAYERS; i++)
if (playeringame[i] &&
/*Added by MC: Freeze mode.*/!(bglobal.freeze && players[i].Bot != NULL))
if (playeringame[i])
P_PlayerThink (&players[i]);
// [ZZ] call the WorldTick hook
@ -145,13 +145,13 @@ void P_Ticker (void)
DThinker::RunThinkers ();
//if added by MC: Freeze mode.
if (!bglobal.freeze && !(level.flags2 & LEVEL2_FROZEN))
if (!level.isFrozen())
{
P_UpdateSpecials (&level);
P_RunEffects (); // [RH] Run particle effects
}
// for par times
// for par times
level.time++;
level.maptime++;
level.totaltime++;