INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-23 13:40:22 -05:00
Code Issues Releases Wiki Activity

Encounter: fix players not spawning during pregame

Browse Source
This commit is contained in:
Jbleezy
2023-04-22 21:42:02 -07:00
parent 44bda67fa8
commit 45302c9d47
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/zm/replaced/_zm.gsc
View File

@ -610,6 +610,8 @@ fade_out_intro_screen_zm( hold_black_time, fade_out_time, destroyed_afterwards )
if ( destroyed_afterwards == 1 ) if ( destroyed_afterwards == 1 )
level.introscreen destroy(); level.introscreen destroy();
level.match_started = 1;
flag_set( "initial_blackscreen_passed" ); flag_set( "initial_blackscreen_passed" );
} }

2
scripts/zm/replaced/_zm_gametype.gsc
View File

@ -174,7 +174,7 @@ onplayerspawned()
hide_gump_loading_for_hotjoiners() hide_gump_loading_for_hotjoiners()
{ {
if(isDefined(level.is_respawn_gamemode_func) && [[level.is_respawn_gamemode_func]]()) if(isDefined(level.should_respawn_func) && [[level.should_respawn_func]]())
{ {
return; return;
} }

2
scripts/zm/replaced/zgrief.gsc
View File

@ -4,7 +4,7 @@
game_mode_spawn_player_logic() game_mode_spawn_player_logic()
{ {
if(isDefined(level.is_respawn_gamemode_func) && [[level.is_respawn_gamemode_func]]()) if(isDefined(level.should_respawn_func) && [[level.should_respawn_func]]())
{ {
return 0; return 0;
} }

21
scripts/zm/zgrief/zgrief_reimagined.gsc
View File

@ -86,7 +86,7 @@ init()
level.autoassign = scripts\zm\replaced\_globallogic_ui::menuautoassign; level.autoassign = scripts\zm\replaced\_globallogic_ui::menuautoassign;
level.custom_spectate_permissions = undefined; level.custom_spectate_permissions = undefined;
level.is_respawn_gamemode_func = ::is_respawn_gamemode; level.should_respawn_func = ::should_respawn;
level.round_start_wait_func = ::round_start_wait; level.round_start_wait_func = ::round_start_wait;
level.increment_score_func = ::increment_score; level.increment_score_func = ::increment_score;
level.show_grief_hud_msg_func = ::show_grief_hud_msg; level.show_grief_hud_msg_func = ::show_grief_hud_msg;
@ -1576,24 +1576,29 @@ get_gamemode_winning_score()
} }
} }
is_respawn_gamemode() should_respawn()
{ {
if (is_true(level.intermission)) if (is_true(level.intermission))
{ {
return 0; return 0;
} }
if (!is_true(level.match_started))
{
return 1;
}
return is_respawn_gamemode();
}
is_respawn_gamemode()
{
if(!isDefined(level.scr_zm_ui_gametype_obj)) if(!isDefined(level.scr_zm_ui_gametype_obj))
{ {
return 0; return 0;
} }
if(level.scr_zm_ui_gametype_obj == "zgrief" || level.scr_zm_ui_gametype_obj == "zrace" || level.scr_zm_ui_gametype_obj == "zcontainment" || level.scr_zm_ui_gametype_obj == "zmeat") return level.scr_zm_ui_gametype_obj == "zgrief" || level.scr_zm_ui_gametype_obj == "zrace" || level.scr_zm_ui_gametype_obj == "zcontainment" || level.scr_zm_ui_gametype_obj == "zmeat";
{
return 1;
}
return 0;
} }
show_grief_hud_msg( msg, msg_parm, offset, delay ) show_grief_hud_msg( msg, msg_parm, offset, delay )