Add direct capture the flag to classic modes

acreloaded · Nov 16, 2020 · 4e69bb0 · 4e69bb0
1 parent 83cc4cb
commit 4e69bb0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg
@@ -163,16 +163,17 @@ menuitem "Team One Shot, One Kill"    "classicmode 2;  nextmapmenu = maps;
 menuitem "One Shot, One Kill"         "classicmode 3;  nextmapmenu = maps;        showmenu maps"
 menuitem
 menuitem "Return-Capture the Flag"    "classicmode 4;  nextmapmenu = maps_flags;  showmenu maps"
-menuitem "Bomber"                     "classicmode 5;  nextmapmenu = maps_flags;  showmenu maps"
-menuitem "Hunt the Flag"              "classicmode 6;  nextmapmenu = maps;        showmenu maps"
-menuitem "Double Keep the Flag"       "classicmode 7;  nextmapmenu = maps_flags;  showmenu maps"
-menuitem "Team-Double Keep the Flag"  "classicmode 8;  nextmapmenu = maps_flags;  showmenu maps"
+menuitem "Direct-Capture the Flag"    "classicmode 5;  nextmapmenu = maps_flags;  showmenu maps"
+menuitem "Bomber"                     "classicmode 6;  nextmapmenu = maps_flags;  showmenu maps"
+menuitem "Hunt the Flag"              "classicmode 7;  nextmapmenu = maps;        showmenu maps"
+menuitem "Double Keep the Flag"       "classicmode 8;  nextmapmenu = maps_flags;  showmenu maps"
+menuitem "Team-Double Keep the Flag"  "classicmode 9;  nextmapmenu = maps_flags;  showmenu maps"
 menuitem
-menuitem "Pistol Frenzy"              "classicmode 9;  nextmapmenu = maps;        showmenu maps"
-menuitem "Last Swiss Standing"        "classicmode 10; nextmapmenu = maps;        showmenu maps"
+menuitem "Pistol Frenzy"              "classicmode 10; nextmapmenu = maps;        showmenu maps"
+menuitem "Last Swiss Standing"        "classicmode 11; nextmapmenu = maps;        showmenu maps"
 menuitem
-menuitem "Team Survivor"              "classicmode 11; nextmapmenu = maps;        showmenu maps"
-menuitem "Survivor"                   "classicmode 12; nextmapmenu = maps;        showmenu maps"
+menuitem "Team Survivor"              "classicmode 12; nextmapmenu = maps;        showmenu maps"
+menuitem "Survivor"                   "classicmode 13; nextmapmenu = maps;        showmenu maps"
 
 newmenu Mastermode
 

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
@@ -36,6 +36,7 @@ void classicmode(int *n)
         { G_DM, G_M_GSP1 | G_M_INSTA },
 
         { G_CTF, G_M_TEAM },
+        { G_CTF, G_M_GSP1 | G_M_TEAM },
         { G_BOMBER, G_M_TEAM },
         { G_HTF, G_M_TEAM },
         { G_KTF, G_M_GSP1 },