Big changed mentioned in IRC channel...

1 files changed, 0 insertions, 188 deletions

diff --git a/data/menus.cfg b/data/menus.cfg
index 7fbdf38..c9e3bc8 100644
--- a/data/menus.cfg
+++ b/data/menus.cfg
@@ -16,11 +16,8 @@ checkrolloveraction = [
     ]
 ]
 
-chooseplayermodel = [guirolloveraction = (playermodelbutton $playermodel); showgui playermodel]
-
 newgui main [
     guilist [
-        guiimage (concatword "packages/icons/" (playermodelicon) ".jpg") [chooseplayermodel] 1.15
         guistrut 0.25
         guilist [
             newname = (getname)
@@ -41,8 +38,6 @@ newgui main [
             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]
@@ -51,7 +46,6 @@ newgui main [
         guibutton "disconnect" "disconnect"         "exit"
     ] [
         guibutton "bot match.."      "showgui botmatch"
-        guibutton "campaign.."       "showgui campaign"
         guibar
         guibutton "options.."        "showgui options"
         guibutton "about.."          "showgui about"
@@ -282,28 +276,6 @@ showcustommaps = [
     custommaps = (sortlist $custommaps x y [naturalsort $x $y])
     showgui custommaps
 ]
-macro playermodelbutton [cleargui 1; playermodel %1]
-
-newgui playermodel [
-    guilist [
-        guilist [
-            loop i $playermodelnum [
-                guibutton (playermodelname $i) (playermodelbutton $i) (playermodelicon $i)
-            ]
-        ]
-        guibar
-        pmidx = (substr $guirolloveraction (strlen (playermodelbutton "")))
-        pmidx = (max 0 (min (- $playermodelnum 1) $pmidx))
-        guilist [
-            guilist [
-                guispring
-                guiplayerpreview $pmidx 0 6 (checkrolloveraction "playermodel ") 4 1 (playermodelname $pmidx)
-                guispring
-            ]
-            guitextbox (playermodelstory $pmidx) 40 9
-        ]
-    ]
-]
 
 crosshairs = [
 "data/crosshair.png data/crosshair_hit.png"
@@ -411,43 +383,6 @@ newgui botmatch [
     guibutton "start match.." [guionclear [startbotmatch]; showgui gamemode]
 ] "bot match"
 
-newgui campaign [
-    guibutton "start Private Stan Sauer"           "showgui privatestansauer"
-    guibutton "start An Army Of One"               "showgui armyofone"
-    guibutton "start Lost"                         "sp lost" "cube"
-    guibutton "start Meltdown"                     "sp skrsp1" "cube"
-    guibutton "start Missile Pass"                 "sp crnsp1" "cube"
-    guibutton "start Level 9"                      "sp level9" "cube"
-    guibar
-    guibutton "start DMSP map.."                   "mode -2; showgui maps"
-    guicheckbox "slow motion"                      "slowmosp"
-    guitext   "skill (default: 3)"
-    guislider skill
-]
-
-newgui armyofone [
-    guilist [
-        guilist [
-            guibutton "Part I"   "sp mpsp6a" "cube"
-            guibutton "Part II"  "sp mpsp6b" "cube"
-            guibutton "Part III" "sp mpsp6c" "cube"
-        ]
-        showmapshot (substr $guirolloveraction 3)
-    ]
-] "An Army Of One"
-
-newgui privatestansauer [
-    guilist [
-        guilist [
-            guibutton "Run N' Gun Part I"        "sp mpsp9a" "cube"
-            guibutton "Run N' Gun Part II"       "sp mpsp9b" "cube"
-            guibutton "Run N' Gun Part III"      "sp mpsp9c" "cube"
-            guibutton "THE SERIOUSLY BIG VALLEY" "sp mpsp10" "cube"
-        ]
-        showmapshot (substr $guirolloveraction 3)
-    ]
-] "Private Stan Sauer"
-
 newgui servers [
     guistayopen [
         guiservers [
@@ -479,26 +414,8 @@ newgui gamemode [
             guibutton "instagib team"      "mode 4; showgui maps"
             guibutton "efficiency"         "mode 5; showgui maps"
             guibutton "efficiency team"    "mode 6; showgui maps"
-            guibutton "tactics"            "mode 7; showgui maps"
-            guibutton "tactics team"       "mode 8; showgui maps"
-            guibutton "capture"            "mode 9; showgui capturemaps"
-            guibutton "regen capture"      "mode 10; showgui capturemaps"
         ]
         guibar
-        guilist [
-            guibutton "ctf"                "mode 11; showgui ctfmaps"
-            guibutton "insta ctf"          "mode 12; showgui ctfmaps"
-            guibutton "efficiency ctf"     "mode 17; showgui ctfmaps"
-            guibutton "protect"            "mode 13; showgui ctfmaps"
-            guibutton "insta protect"      "mode 14; showgui ctfmaps"
-            guibutton "efficiency protect" "mode 18; showgui ctfmaps"
-            guibutton "hold"               "mode 15; showgui capturemaps"
-            guibutton "insta hold"         "mode 16; showgui capturemaps"
-            guibutton "efficiency hold"    "mode 19; showgui capturemaps"
-            guibutton "collect"            "mode 20; showgui ctfmaps"
-            guibutton "insta collect"      "mode 21; showgui ctfmaps"
-            guibutton "efficiency collect" "mode 22; showgui ctfmaps"
-        ]
     ]
 ]
 
@@ -949,60 +866,7 @@ guitab "cfg" ///////////////////////////////////////////////////////////////////
 ]
 
 skies1 = [
-    aftas/sky/orbe
-    blindabuser/blindasky
-    blindabuser/blindasky2
-    darc/forge
-    dash/moon
-    hazel/green
-    humus/meadow
-    ik2k/env/iklake
-    jon/prarie
-    mayhem/duomo
-    mayhem/eclipse
-    meister/uzze
-    penguins/arid
-    penguins/arid2
-    penguins/cocoa
-    penguins/divine
-    penguins/harmony
-    penguins/mellow
-    penguins/mystic
-]
-skies2 = [
-    penguins/violence
-    penguins/wrath
-    penguins/yonder
-    penguins/zeus
-    ratboy/skyboxes/coward
-    shmutzwurst/london
     skyboxes/black
-    skyboxes/bbk/d
-    skyboxes/bbk/dark2
-    skyboxes/bbk/n1
-    skyboxes/bbk/t
-    skyboxes/clearsky052
-    skyboxes/darkness
-    skyboxes/evilsky
-    skyboxes/morning
-    skyboxes/remus/sky01
-    skyboxes/turbulent
-    skyboxes/ulukai/corona
-    skyboxes/white
-]
-skies3 = [
-    socksky/barren
-    socksky/desert
-    socksky/devpun
-    socksky/emerald
-    socksky/frozen
-    socksky/frozendusk
-    socksky/grave
-    socksky/mars
-    socksky/nightball
-    socksky/stratosphere
-    socksky/valley
-    staffy/staffy
 ]
 
 genskyitems = [
@@ -1125,44 +989,6 @@ newgui materials [
     //guibutton "water waves off"                    "waterwaves 0"
 ]
 
-newgui triggers [
-    guibutton [invisible]               [BTmm = -1; showgui trigger2]
-    guibutton [a carrot]                [BTmm = 23; showgui trigger2]
-    guibutton [switch #1]               [BTmm = 24; showgui trigger2]
-    guibutton [switch #2]               [BTmm = 25; showgui trigger2]
-    guibutton [door #1]                 [BTmm = 26; showgui trigger2]
-    guibutton [door #2]                 [BTmm = 27; showgui trigger2]
-    guibutton [door #3]                 [BTmm = 28; showgui trigger2]
-]
-
-newgui trigger2 [
-    guibutton [animation loop]                      [BTtt = 0; showgui trigger3]
-    guibutton [trigger once (popback)]              [BTtt = 1; showgui trigger3]
-    guibutton [trigger once (popback & rumble)]     [BTtt = 2; showgui trigger3]
-    guibutton [trigger once]                        [BTtt = 3; showgui trigger3]
-    guibutton [trigger once (rumble)]               [BTtt = 4; showgui trigger3]
-    guibutton [trigger multiple (popback)]          [BTtt = 5; showgui trigger3]
-    guibutton [trigger multiple (popback & rumble)] [BTtt = 6; showgui trigger3]
-    guibutton [trigger multiple]                    [BTtt = 7; showgui trigger3]
-    guibutton [trigger multiple (rumble)]           [BTtt = 8; showgui trigger3]
-    guibutton [door (open once)]                    [BTtt = 9; showgui trigger3]
-    guibutton [door (auto close)]                   [BTtt = 10; showgui trigger3]
-    guibutton [door (locked)]                       [BTtt = 11; showgui trigger3]
-    guibutton [vanishing trigger]                   [BTtt = 12; showgui trigger3]
-    guibutton [vanishing trigger (rumble)]          [BTtt = 13; showgui trigger3]
-    guibutton [End Of Level Trigger]                [BTtt = 29; showgui trigger3]
-]
-
-build_trigger = [newent mapmodel $BTmm $BTtt $BTti]
-
-newgui trigger3 [
-    loop i 9 [
-        tjt = (concat tag (concatword # $i))
-        tjc = (concat BTti "=" $i ";" "build_trigger")
-        guibutton $tjt $tjc
-    ]
-]
-
 resetlight = [
     lightcolour = 0
     lightbright = 1
@@ -1258,18 +1084,6 @@ newgui mapmodels [
     ]
 ]
 
-newgui monsters [
-    guibutton "ogro / fireball"         "newent monster 0"
-    guibutton "rhino / chaingun"        "newent monster 1"
-    guibutton "ratamahatta / shotgun"   "newent monster 2"
-    guibutton "slith / rifle"           "newent monster 3"
-    guibutton "bauul / RL"              "newent monster 4"
-    guibutton "hellpig / bite"          "newent monster 5"
-    guibutton "knight / iceball"        "newent monster 6"
-    guibutton "goblin / slimeball"      "newent monster 7"
-    guibutton "spider / grenade"        "newent monster 8"
-]
-
 newgui postfx [
     guibutton "(effect OFF)"            "clearpostfx"
     guibutton "bloom (subtle: 30%)"     "bloom 0.3"
@@ -1325,8 +1139,6 @@ newgui options [ ///////////////////////////////////////////////////////////////
         ]
     ]
     guilist [
-        guicheckbox "force matching player models" forceplayermodels
-        guibar
         guicheckbox "always use team skins" teamskins
     ]
     guicheckbox "hit sound" hitsound