updated all restart functions to use waittill

This commit is contained in:
JezuzLizard 2020-03-09 15:19:39 -07:00 committed by GitHub
parent 2e94a8346d
commit 2d384547c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -121,9 +121,9 @@ add_bots()
{ {
flag_clear( "solo_game" ); flag_clear( "solo_game" );
flag_clear( "start_zombie_round_logic" ); flag_clear( "start_zombie_round_logic" );
players = get_players(); players = get_players();
level.waiting = 1; level.waiting = 1;
thread waitMessage(); thread waitMessage();
while ( players.size < level.player_quota && level.player_quota_active || players.size < 1) while ( players.size < level.player_quota && level.player_quota_active || players.size < 1)
{ {
wait 0.5; wait 0.5;
@ -133,7 +133,7 @@ add_bots()
level.countdown_start = 1; level.countdown_start = 1;
thread countdownTimer(); thread countdownTimer();
wait level.wait_time; wait level.wait_time;
flag_set( "start_zombie_round_logic" ); flag_set( "start_zombie_round_logic" );
} }
waitMessage() waitMessage()
@ -296,15 +296,9 @@ gscRestart()
{ {
return; return;
} }
while ( 1 ) level waittill( "end_game" );
{ wait 20;
if ( level.intermission ) map_restart( false );
{
wait 20;
map_restart( false );
}
wait 1;
}
} }
emptyLobbyRestart() emptyLobbyRestart()
@ -334,16 +328,10 @@ gscMapChange()
{ {
return; return;
} }
while ( 1 ) level waittill( "end_game" );
{ wait 20;
if ( level.intermission ) mapChange( location() );
{ map_restart( false );
wait 20;
mapChange( location() );
map_restart( false );
}
wait 1;
}
} }
location() location()