zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 12:32:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- initial adjustments for P_Ticker.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-28 22:33:50 +01:00
parent befacddab4
commit 623330f938
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/p_tick.cpp
View file

@ -62,7 +62,8 @@ bool P_CheckTickerPaused ()
&& players[consoleplayer].viewz != NO_VALUE && players[consoleplayer].viewz != NO_VALUE
&& wipegamestate == gamestate) && wipegamestate == gamestate)
{ {
S_PauseSound (!(level.flags2 & LEVEL2_PAUSE_MUSIC_IN_MENUS), false); // Only the current UI level's settings are relevant for sound.
S_PauseSound (!(currentUILevel->flags2 & LEVEL2_PAUSE_MUSIC_IN_MENUS), false);
return true; return true;
} }
return false; return false;
@ -95,11 +96,15 @@ void P_Ticker (void)
DPSprite::NewTick(); DPSprite::NewTick();
// [RH] Frozen mode is only changed every 4 tics, to make it work with A_Tracer(). // [RH] Frozen mode is only changed every 4 tics, to make it work with A_Tracer().
if ((level.maptime & 3) == 0) // This may not be perfect but it is not really relevant for sublevels that tracer homing behavior is preserved.
if ((currentUILevel->maptime & 3) == 0)
{ {
if (bglobal.changefreeze) if (bglobal.changefreeze)
{ {
level.frozenstate ^= 2; for (auto Level : AllLevels())
{
Level->frozenstate ^= 2;
}
bglobal.freeze ^= 1; bglobal.freeze ^= 1;
bglobal.changefreeze = 0; bglobal.changefreeze = 0;
} }
@ -120,13 +125,16 @@ void P_Ticker (void)
P_ResetSightCounters (false); P_ResetSightCounters (false);
R_ClearInterpolationPath(); R_ClearInterpolationPath();
// Reset all actor interpolations for all actors before the current thinking turn so that indirect actor movement gets properly interpolated. // Reset all actor interpolations on all levels before the current thinking turn so that indirect actor movement gets properly interpolated.
TThinkerIterator<AActor> it; for (auto Level : AllLevels())
AActor *ac;
while ((ac = it.Next()))
{ {
ac->ClearInterpolation(); auto it = Level->GetThinkerIterator<AActor>();
AActor *ac;
while ((ac = it.Next()))
{
ac->ClearInterpolation();
}
} }
// Since things will be moving, it's okay to interpolate them in the renderer. // Since things will be moving, it's okay to interpolate them in the renderer.