summaryrefslogtreecommitdiff
path: root/src/strife/p_tick.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/strife/p_tick.c')
-rw-r--r--src/strife/p_tick.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/strife/p_tick.c b/src/strife/p_tick.c
index 55e893ab..cca2e2c4 100644
--- a/src/strife/p_tick.c
+++ b/src/strife/p_tick.c
@@ -130,22 +130,23 @@ void P_Ticker (void)
// run the tic
if (paused)
- return;
+ return;
// pause if in menu and at least one tic has been run
- if ( !netgame
- && menuactive
- && !demoplayback
- && players[consoleplayer].viewz != 1)
+ // haleyjd 09/08/10: menuactive -> menupause
+ if (!netgame
+ && menupause
+ && !demoplayback
+ && players[consoleplayer].viewz != 1)
{
- return;
+ return;
}
-
+
for (i=0 ; i<MAXPLAYERS ; i++)
- if (playeringame[i])
- P_PlayerThink (&players[i]);
-
+ if (playeringame[i])
+ P_PlayerThink (&players[i]);
+
P_RunThinkers ();
P_UpdateSpecials ();
P_RespawnSpecials ();