X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_menu.pas;h=60750aa8aa5b133a4f4441624e7f5821f63deaad;hb=a0b4df67e96c6b5e55e95269a87975df67692e6b;hp=7c51f80fc92564d3b0784fef7019a2d2231eb37e;hpb=7292fe409145dfcbb2776e34bb64d56e32985b9d;p=d2df-sdl.git

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 7c51f80..60750aa 100644
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_menu;
 
 interface
@@ -45,8 +45,8 @@ uses
   g_gui, g_textures, e_graphics, g_main, g_window, g_game, g_map,
   g_basic, g_console, g_sound, g_gfx, g_player, g_options, g_weapons,
   e_log, SysUtils, CONFIG, g_playermodel, DateUtils,
-  MAPSTRUCT, wadreader, Math, g_saveload,
-  e_textures, GL, GLExt, g_language,
+  MAPDEF, wadreader, Math, g_saveload,
+  e_texture, GL, GLExt, g_language,
   g_net, g_netmsg, g_netmaster, g_items, e_input;
 
 
@@ -506,20 +506,34 @@ end;
 
 procedure ProcSwitchMonstersCustom(Sender: TGUIControl);
 begin
+    // don't turn off monsters in DM
   with TGUIMenu(g_ActiveWindow.GetControl('mCustomGameMenu')) do
-    if TGUISwitch(GetControl('swGameMode')).GetText = _lc[I_MENU_GAME_TYPE_COOP] then
+    if TGUISwitch(GetControl('swGameMode')).GetText <> _lc[I_MENU_GAME_TYPE_CTF] then
       TGUISwitch(GetControl('swMonsters')).ItemIndex := 0
     else
       TGUISwitch(GetControl('swMonsters')).ItemIndex := 1;
+  {
+    if TGUISwitch(GetControl('swGameMode')).GetText = _lc[I_MENU_GAME_TYPE_COOP] then
+      TGUISwitch(GetControl('swMonsters')).ItemIndex := 0
+    else if TGUISwitch(GetControl('swGameMode')).GetText = _lc[I_MENU_GAME_TYPE_CTF] then
+      TGUISwitch(GetControl('swMonsters')).ItemIndex := 1;
+  }
 end;
 
 procedure ProcSwitchMonstersNet(Sender: TGUIControl);
 begin
+  // don't turn off monsters in DM
   with TGUIMenu(g_ActiveWindow.GetControl('mNetServerMenu')) do
-    if TGUISwitch(GetControl('swGameMode')).GetText = _lc[I_MENU_GAME_TYPE_COOP] then
+    if TGUISwitch(GetControl('swGameMode')).GetText <> _lc[I_MENU_GAME_TYPE_CTF] then
       TGUISwitch(GetControl('swMonsters')).ItemIndex := 0
     else
       TGUISwitch(GetControl('swMonsters')).ItemIndex := 1;
+    {
+    if TGUISwitch(GetControl('swGameMode')).GetText = _lc[I_MENU_GAME_TYPE_COOP] then
+      TGUISwitch(GetControl('swMonsters')).ItemIndex := 0
+    else if TGUISwitch(GetControl('swGameMode')).GetText = _lc[I_MENU_GAME_TYPE_CTF] then
+      TGUISwitch(GetControl('swMonsters')).ItemIndex := 1;
+    }
 end;
 
 procedure ProcStartCustomGame();
@@ -1124,12 +1138,12 @@ end;
 
 procedure ProcSingle1Player();
 begin
-  g_Game_StartSingle('megawads/DOOM2D.WAD:\MAP01', False, 1);
+  g_Game_StartSingle(gDefaultMegawadStart, False, 1);
 end;
 
 procedure ProcSingle2Players();
 begin
-  g_Game_StartSingle('megawads/DOOM2D.WAD:\MAP01', True, 2);
+  g_Game_StartSingle(gDefaultMegawadStart, True, 2);
 end;
 
 procedure ProcSelectMapMenu();