move the multiplayer menu into main menu

casey0102 · Nov 26, 2012 · 66b6620 · 66b6620
1 parent 5b75591
commit 66b6620
Showing 1 changed file with 36 additions and 39 deletions.
diff --git a/data/menus.cfg b/data/menus.cfg
@@ -3,21 +3,48 @@
 
 togglemainmenu = [
     if (! (cleargui 1)) [
-        showgui (? (isconnected) multiplayer main)
+        showgui main
     ]
 ]
 
 bind ESCAPE [togglemainmenu]
 
 newgui main [
-    guibutton "multiplayer.."    "showgui multiplayer"
-    guibutton "bot match.."      "showgui botmatch"
-    guibutton "campaign.."       "showgui campaign"
-    guibutton "load map.."       "showgui maps"
-    guibutton "editing.."        "showgui editing"
-    guibutton "options.."        "showgui options"
-    guibutton "about.."          "showgui about"
-    guibutton "quit"             "quit"                 "exit"
+    guilist [
+        guitext "name: " (playermodelicon)
+        newname = (getname)
+        guifield newname 15 [name $newname]
+    ]
+    guibutton (concat "model:" (playermodelname)) [guirolloveraction = (playermodelbutton $playermodel); showgui playermodel] (playermodelicon)
+    guilist [
+        guibutton "crosshair: " [showgui crosshair] (playermodelicon)
+        guiimage (getcrosshair) [showgui crosshair] 0.5
+    ]
+    guibar
+    guibutton "server browser.."  "showgui servers"
+    if (isconnected) [
+        guibar
+        if (|| $editing (m_edit (getmode))) [
+            guibutton "editing.." "showgui editing"
+        ]
+        guibutton "vote game mode / map.." "showgui gamemode"
+        // guibutton "lanconnect"
+        // guibutton "connect localhost"                
+        guibutton "switch team" [if (strcmp (getteam) "good") [team evil] [team good]]
+        guibutton "toggle spectator" [spectator (! (isspectator (getclientnum)))] "spectator"
+        guibutton "master.." [showgui master]
+        guibar
+        guibutton "options.."  "showgui options"
+        guibutton "disconnect" "disconnect"         "exit"
+    ] [
+        guibutton "bot match.."      "showgui botmatch"
+        guibutton "campaign.."       "showgui campaign"
+        guibutton "load map.."       "showgui maps"
+        guibutton "editing.."        "showgui editing"
+        guibutton "options.."        "showgui options"
+        guibutton "about.."          "showgui about"
+        guibutton "quit"             "quit"                 "exit"
+    ]
 ]
 
 newgui about [
@@ -243,36 +270,6 @@ newgui master [
   ]
 ]
 
-newgui multiplayer [
-    guilist [
-        guitext "name: " (playermodelicon)
-        newname = (getname)
-        guifield newname 15 [name $newname]
-    ]
-    guibutton (concat "model:" (playermodelname)) [guirolloveraction = (playermodelbutton $playermodel); showgui playermodel] (playermodelicon)
-    guilist [
-        guibutton "crosshair: " [showgui crosshair] (playermodelicon)
-        guiimage (getcrosshair) [showgui crosshair] 0.5
-    ]
-    guibar
-    guibutton "server browser.."  "showgui servers"
-    if (isconnected) [
-        guibar
-        if (|| $editing (m_edit (getmode))) [
-            guibutton "editing.." "showgui editing"
-        ]
-        guibutton "vote game mode / map.." "showgui gamemode"
-        // guibutton "lanconnect"
-        // guibutton "connect localhost"
-        guibutton "switch team" [if (strcmp (getteam) "good") [team evil] [team good]]
-        guibutton "toggle spectator" [spectator (! (isspectator (getclientnum)))] "spectator"
-        guibutton "master.." [showgui master]
-        guibar
-        guibutton "options.."  "showgui options"
-        guibutton "disconnect" "disconnect"         "exit"
-    ]
-]
-
 botmatchcount = 5
 botmatchminskill = 50
 botmatchmaxskill = 100