diff options
| author | James Haley | 2010-09-08 05:27:33 +0000 |
|---|---|---|
| committer | James Haley | 2010-09-08 05:27:33 +0000 |
| commit | 57dee80794dd9343f7038991ead3d92a2c34241a (patch) | |
| tree | 99f655c29449a3268bb709d60d9af10ddea67327 /src/strife/p_tick.c | |
| parent | 691f1b3acbe3e9f847b7ded5aac98425fea054f0 (diff) | |
| download | chocolate-doom-57dee80794dd9343f7038991ead3d92a2c34241a.tar.gz chocolate-doom-57dee80794dd9343f7038991ead3d92a2c34241a.tar.bz2 chocolate-doom-57dee80794dd9343f7038991ead3d92a2c34241a.zip | |
Functional menupause/menupausetime, fix to wait when there's not a
background pic, and elimination of more dead code in the menu system
Subversion-branch: /branches/strife-branch
Subversion-revision: 2042
Diffstat (limited to 'src/strife/p_tick.c')
| -rw-r--r-- | src/strife/p_tick.c | 21 |
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 (); |