game: ... but only if we're not in game right now

[d2df-sdl.git] / src / game / g_options.pas

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index ecc30f9b7606d64e9dec8b22579d5609d9d84944..59028f5534bb6772957420c8071eacb21605d3be 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -270,9 +270,13 @@ begin
   gsSpawnInvul := 0;
   gsItemRespawnTime := 60;
   gsGameFlags := GAME_OPTION_ALLOWEXIT or GAME_OPTION_DMKEYS or
-    GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
+    GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER or
+    GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE;
   gsPlayers := 1;
 
+  if not gGameOn then
+    g_Options_ApplyGameSettings;
+
   (* section MasterServer *)
   NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665';
   g_Net_Slist_Set(NetMasterList);