From 2c147b5a7106a74252a3f71de731adff9c472070 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Fri, 28 Feb 2020 01:50:24 +0300 Subject: [PATCH] don't let SP games reset warmup time --- src/game/g_game.pas | 15 +++++++++++++++ src/game/g_menu.pas | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/game/g_game.pas b/src/game/g_game.pas index f8cb397..bc645b0 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -4394,6 +4394,11 @@ begin gGameSettings.Options := gGameSettings.Options + GAME_OPTION_BOTVSMONSTER; gSwitchGameMode := GM_SINGLE; + gLMSRespawn := LMS_RESPAWN_NONE; + gLMSRespawnTime := 0; + gSpectLatchPID1 := 0; + gSpectLatchPID2 := 0; + g_Game_ExecuteEvent('ongamestart'); // Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ: @@ -4473,6 +4478,11 @@ begin gAimLine := False; gShowMap := False; + gLMSRespawn := LMS_RESPAWN_NONE; + gLMSRespawnTime := 0; + gSpectLatchPID1 := 0; + gSpectLatchPID2 := 0; + g_Game_ExecuteEvent('ongamestart'); // Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ: @@ -4572,6 +4582,11 @@ begin gAimLine := False; gShowMap := False; + gLMSRespawn := LMS_RESPAWN_NONE; + gLMSRespawnTime := 0; + gSpectLatchPID1 := 0; + gSpectLatchPID2 := 0; + g_Game_ExecuteEvent('ongamestart'); // Óñòàíîâêà ðàçìåðîâ îêíà èãðîêà diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas index b29a513..d409cc6 100644 --- a/src/game/g_menu.pas +++ b/src/game/g_menu.pas @@ -683,7 +683,10 @@ begin else gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSPLAYER; end; - gGameSettings.ItemRespawnTime := gsItemRespawnTime; // TODO: get this crap out of here + // TODO: get this crap out of here + gGameSettings.ItemRespawnTime := gsItemRespawnTime; + gGameSettings.WarmupTime := gsWarmupTime; + gGameSettings.SpawnInvul := gsSpawnInvul; end; end; -- 2.29.2