diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp index f36d0bd0f..d9440547b 100644 --- a/src/wi_stuff.cpp +++ b/src/wi_stuff.cpp @@ -69,7 +69,6 @@ CVAR(Bool, wi_percents, true, CVAR_ARCHIVE) CVAR(Bool, wi_showtotaltime, true, CVAR_ARCHIVE) CVAR(Bool, wi_noautostartmap, false, CVAR_USERINFO | CVAR_ARCHIVE) -CVAR(Int, wi_autoadvance, 0, CVAR_SERVERINFO) // States for the intermission enum EState diff --git a/wadsrc/static/zscript/ui/statscreen/statscreen.zs b/wadsrc/static/zscript/ui/statscreen/statscreen.zs index b90aceebb..d3ba48bf8 100644 --- a/wadsrc/static/zscript/ui/statscreen/statscreen.zs +++ b/wadsrc/static/zscript/ui/statscreen/statscreen.zs @@ -483,17 +483,6 @@ class StatusScreen abstract play version("2.5") // //==================================================================== - bool autoSkip() - { - return wi_autoadvance > 0 && bcnt > (wi_autoadvance * Thinker.TICRATE); - } - - //==================================================================== - // - // - // - //==================================================================== - protected virtual void initNoState () { CurState = NoState; @@ -524,7 +513,7 @@ class StatusScreen abstract play version("2.5") noauto |= players[i].GetNoAutostartMap(); } } - if (!noauto || autoSkip()) + if (!noauto) { cnt--; } diff --git a/wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs b/wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs index 7393877b6..8d50d63ce 100644 --- a/wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs +++ b/wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs @@ -45,9 +45,8 @@ class CoopStatusScreen : StatusScreen int i; int fsum; bool stillticking; - bool autoskip = autoSkip(); - if ((acceleratestage || autoskip) && ng_state != 10) + if (acceleratestage && ng_state != 10) { acceleratestage = 0; @@ -171,16 +170,7 @@ class CoopStatusScreen : StatusScreen } else if (ng_state == 10) { - int i; - for (i = 0; i < MAXPLAYERS; i++) - { - // If the player is in the game and not ready, stop checking - if (playeringame[i] && players[i].Bot == NULL && !playerready[i]) - break; - } - - // All players are ready; proceed. - if ((i == MAXPLAYERS && acceleratestage) || autoskip) + if (acceleratestage) { PlaySound("intermission/pastcoopstats"); initShowNextLoc(); diff --git a/wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs b/wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs index 8807fb19c..17964907d 100644 --- a/wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs +++ b/wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs @@ -48,9 +48,8 @@ class DeathmatchStatusScreen : StatusScreen int i; bool stillticking; - bool doautoskip = autoSkip(); - if ((acceleratestage || doautoskip) && ng_state != 6) + if (acceleratestage && ng_state != 6) { acceleratestage = 0; @@ -117,16 +116,7 @@ class DeathmatchStatusScreen : StatusScreen } else if (ng_state == 6) { - int i; - for (i = 0; i < MAXPLAYERS; i++) - { - // If the player is in the game and not ready, stop checking - if (playeringame[i] && players[i].Bot == NULL && !playerready[i]) - break; - } - - // All players are ready; proceed. - if ((i == MAXPLAYERS && acceleratestage) || doautoskip) + if (acceleratestage) { PlaySound("intermission/pastdmstats"); initShowNextLoc();