zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-06 01:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Revert "Multi-intermission waits for all players" and "Added wi_autoadvance".

Browse source 
# Conflicts:
#	src/wi_stuff.cpp
#	wadsrc/static/zscript/ui/statscreen/statscreen.zs
#	wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs
This commit is contained in:
drfrag 2021-01-12 21:48:12 +01:00
parent b40aedde19
commit 423baf9a25
4 changed files with 5 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/wi_stuff.cpp
View file

@ -69,7 +69,6 @@
CVAR(Bool, wi_percents, true, CVAR_ARCHIVE) CVAR(Bool, wi_percents, true, CVAR_ARCHIVE)
CVAR(Bool, wi_showtotaltime, true, CVAR_ARCHIVE) CVAR(Bool, wi_showtotaltime, true, CVAR_ARCHIVE)
CVAR(Bool, wi_noautostartmap, false, CVAR_USERINFO | CVAR_ARCHIVE) CVAR(Bool, wi_noautostartmap, false, CVAR_USERINFO | CVAR_ARCHIVE)
CVAR(Int, wi_autoadvance, 0, CVAR_SERVERINFO)
// States for the intermission // States for the intermission
enum EState enum EState

13
wadsrc/static/zscript/ui/statscreen/statscreen.zs
View file

@ -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 () protected virtual void initNoState ()
{ {
CurState = NoState; CurState = NoState;
@ -524,7 +513,7 @@ class StatusScreen abstract play version("2.5")
noauto |= players[i].GetNoAutostartMap(); noauto |= players[i].GetNoAutostartMap();
} }
} }
if (!noauto || autoSkip()) if (!noauto)
{ {
cnt--; cnt--;
} }

14
wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs
View file

@ -45,9 +45,8 @@ class CoopStatusScreen : StatusScreen
int i; int i;
int fsum; int fsum;
bool stillticking; bool stillticking;
bool autoskip = autoSkip();
if ((acceleratestage || autoskip) && ng_state != 10) if (acceleratestage && ng_state != 10)
{ {
acceleratestage = 0; acceleratestage = 0;
@ -171,16 +170,7 @@ class CoopStatusScreen : StatusScreen
} }
else if (ng_state == 10) else if (ng_state == 10)
{ {
int i; if (acceleratestage)
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)
{ {
PlaySound("intermission/pastcoopstats"); PlaySound("intermission/pastcoopstats");
initShowNextLoc(); initShowNextLoc();

14
wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs
View file

@ -48,9 +48,8 @@ class DeathmatchStatusScreen : StatusScreen
int i; int i;
bool stillticking; bool stillticking;
bool doautoskip = autoSkip();
if ((acceleratestage || doautoskip) && ng_state != 6) if (acceleratestage && ng_state != 6)
{ {
acceleratestage = 0; acceleratestage = 0;
@ -117,16 +116,7 @@ class DeathmatchStatusScreen : StatusScreen
} }
else if (ng_state == 6) else if (ng_state == 6)
{ {
int i; if (acceleratestage)
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)
{ {
PlaySound("intermission/pastdmstats"); PlaySound("intermission/pastdmstats");
initShowNextLoc(); initShowNextLoc();