update hudsetup map path in menu code

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_playersetup.c

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 9548bf3182e9af3cabcf529a0d3f25018a537cd3..8c75c1f469f84a3c0b6c524d8f3d226a043cc04e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -23,15 +23,15 @@ entity makeXonoticPlayerSettingsTab()
        me.configureDialog(me);
        return me;
 }
-void drawXonoticPlayerSettingsTab(entity me)
+void XonoticPlayerSettingsTab_draw(entity me)
 {
        if(cvar_string("_cl_name") == "Player")
                me.playerNameLabel.alpha = ((mod(time * 2, 2) < 1) ? 1 : 0);
        else
                me.playerNameLabel.alpha = me.playerNameLabelAlpha;
-       drawContainer(me);
+       SUPER(XonoticPlayerSettingsTab).draw(me);
 }
-void fillXonoticPlayerSettingsTab(entity me)
+void XonoticPlayerSettingsTab_fill(entity me)
 {
        entity e, pms, sl, label, e0, box;
        float i, r, m, n;
@@ -168,7 +168,6 @@ void fillXonoticPlayerSettingsTab(entity me)
                me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodelsfromxonotic", string_null, "Custom"));
                me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodels", string_null, "All"));
        #endif
-       me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", "Disable gore effects"));
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Gibs:"));
@@ -188,42 +187,10 @@ void HUDSetup_Join_Click(entity me, entity btn)
 {
        if(! (gamestatus & (GAME_CONNECTED | GAME_ISSERVER)))
        {
-               localcmd("map hudtest", "\n");
-               /*float glob, i, n, fh;
-               string s;
-               glob = search_begin("maps/*.instantaction", TRUE, TRUE);
-               if(glob < 0)
-                       return;
-               i = ceil(random() * search_getsize(glob)) - 1;
-               fh = fopen(search_getfilename(glob, i), FILE_READ);
-               search_end(glob);
-               if(fh < 0)
-                       return;
-               while((s = fgets(fh)))
-               {
-                       if(substring(s, 0, 4) == "set ")
-                               s = substring(s, 4, strlen(s) - 4);
-                       n = tokenize_console(s);
-                       if(argv(0) == "bot_number")
-                               cvar_set("bot_number", argv(1));
-                       else if(argv(0) == "skill")
-                               cvar_set("skill", argv(1));
-                       else if(argv(0) == "timelimit")
-                               cvar_set("timelimit_override", argv(1));
-                       else if(argv(0) == "fraglimit")
-                               cvar_set("fraglimit_override", argv(1));
-                       else if(argv(0) == "changelevel")
-                       {
-                               fclose(fh);
-                               localcmd("\nmenu_loadmap_prepare\n");
-                               MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH);
-                               MapInfo_LoadMap(argv(1));
-                               cvar_set("lastlevel", "1");
-                               return;
-                       }
-               }
-               fclose(fh);*/
+               localcmd("map hudsetup/hudsetup", "\n");
        }
+       else
+               localcmd("togglemenu 0\n");
        localcmd("_hud_configure 1", "\n");
 }
 #endif