Options: add third masterserver (by TerminalHash) in config.

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

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index cc7e3d3364842034c94c238e3a6911642bdb8e92..fa6dafd7524f29e532fbb9930dc1ee5167c3ed82 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -271,12 +271,15 @@ 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';
+  NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665, carrotterminal.deadsoftware.ru:25665';
   g_Net_Slist_Set(NetMasterList);
 
   (* section Server *)