Game: Weapon autoswitch by travi$

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

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index cc7e3d3364842034c94c238e3a6911642bdb8e92..9cd3cbf59e4c1d27723e4b664b0a4c13e11a80ce 100644 (file)
--- 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;
 
@@ -271,9 +273,12 @@ begin
   gsItemRespawnTime := 60;
   gsGameFlags := GAME_OPTION_ALLOWEXIT or GAME_OPTION_DMKEYS or
     GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER or
-    GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE;
+    GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE or
+    GAME_OPTION_ALLOWDROPFLAG;
   gsPlayers := 1;
-  g_Options_ApplyGameSettings;
+
+  if not gGameOn then
+    g_Options_ApplyGameSettings;
 
   (* section MasterServer *)
   NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665';