X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_options.pas;h=29df099f1bef5ab1cde7572683a84918a2c69308;hb=8ab55cecac4c74e7b2a91e3a529d22346317cb2f;hp=9cd3cbf59e4c1d27723e4b664b0a4c13e11a80ce;hpb=86d45dd42fd3cf9c183883e4ab1abe5b607e1779;p=d2df-sdl.git

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 9cd3cbf..29df099 100644
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -62,8 +62,6 @@ var
   gsSDLSampleRate: Integer;
   gsSDLBufferSize: Integer;
   gDefaultMegawadStart: AnsiString;
-  gBerserkAutoswitch: Boolean;
-  gWeaponAutoswitch: Boolean;
   glNPOTOverride: Boolean = false;
 
   (* Latched game settings *)
@@ -255,8 +253,6 @@ begin
   wadoptFast := False;
   e_FastScreenshots := True;
   gDefaultMegawadStart := DF_Default_Megawad_Start;
-  gBerserkAutoswitch := True;
-  gWeaponAutoswitch := True;
   g_dbg_scale := 1.0;
   gSaveStats := False;
 
@@ -281,7 +277,7 @@ begin
     g_Options_ApplyGameSettings;
 
   (* section MasterServer *)
-  NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665';
+  NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665, carrotterminal.deadsoftware.ru:25665';
   g_Net_Slist_Set(NetMasterList);
 
   (* section Server *)