From: fgsfds <pvt.fgsfds@gmail.com>
Date: Thu, 27 Feb 2020 22:50:24 +0000 (+0300)
Subject: don't let SP games reset warmup time
X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=2c147b5a7106a74252a3f71de731adff9c472070

don't let SP games reset warmup time
---

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;