don't let SP games reset warmup time

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index f8cb3975b6472e7babdae2a39a11705ac0710e19..bc645b0a57fd12de70a6888d4e8c4c32ec9c52fd 100644 (file)
--- 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 b29a5137c4ff173c7e67b41bac7359d980736c76..d409cc6f484bcb9974ec707452c7ea19b3fc9cc2 100644 (file)
--- 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;