X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_options.pas;h=9cd3cbf59e4c1d27723e4b664b0a4c13e11a80ce;hb=86d45dd42fd3cf9c183883e4ab1abe5b607e1779;hp=ecc30f9b7606d64e9dec8b22579d5609d9d84944;hpb=9908fb47bd6967e6cd8a8641599615385dcb12c9;p=d2df-sdl.git

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index ecc30f9..9cd3cbf 100644
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -63,6 +63,7 @@ var
   gsSDLBufferSize: Integer;
   gDefaultMegawadStart: AnsiString;
   gBerserkAutoswitch: Boolean;
+  gWeaponAutoswitch: Boolean;
   glNPOTOverride: Boolean = false;
 
   (* Latched game settings *)
@@ -255,6 +256,7 @@ begin
   e_FastScreenshots := True;
   gDefaultMegawadStart := DF_Default_Megawad_Start;
   gBerserkAutoswitch := True;
+  gWeaponAutoswitch := True;
   g_dbg_scale := 1.0;
   gSaveStats := False;
 
@@ -270,9 +272,14 @@ 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 or
+    GAME_OPTION_ALLOWDROPFLAG;
   gsPlayers := 1;
 
+  if not gGameOn then
+    g_Options_ApplyGameSettings;
+
   (* section MasterServer *)
   NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665';
   g_Net_Slist_Set(NetMasterList);