Merge branch 'master' into mirceakitsune/multijump

[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 68842113e77d087916b7167fe9e0bb6e4070171c..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;
@@ -187,7 +187,7 @@ void HUDSetup_Join_Click(entity me, entity btn)
 {
        if(! (gamestatus & (GAME_CONNECTED | GAME_ISSERVER)))
        {
-               localcmd("map hudsetup", "\n");
+               localcmd("map hudsetup/hudsetup", "\n");
        }
        else
                localcmd("togglemenu 0\n");