Merge branch 'TimePath/qc_updates' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_profile.qc

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
index 1adfb015eff1d85e192034eab19ce93c93f351cb..f9615d21ccdde1b77b0701a7342f17f33f26649a 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticProfileTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_MULTIPLAYER_PROFILE_H
+#define DIALOG_MULTIPLAYER_PROFILE_H
+#include "tab.qc"
+CLASS(XonoticProfileTab, XonoticTab)

        METHOD(XonoticProfileTab, fill, void(entity))
        METHOD(XonoticProfileTab, draw, void(entity))
        ATTRIB(XonoticProfileTab, title, string, _("Profile"))
        METHOD(XonoticProfileTab, fill, void(entity))
        METHOD(XonoticProfileTab, draw, void(entity))
        ATTRIB(XonoticProfileTab, title, string, _("Profile"))


@@ -16,7 +18,7 @@ entity makeXonoticProfileTab();
 entity makeXonoticProfileTab()
 {
        entity me;
 entity makeXonoticProfileTab()
 {
        entity me;

-       me = spawnXonoticProfileTab();
+       me = NEW(XonoticProfileTab);

        me.configureDialog(me);
        return me;
 }
        me.configureDialog(me);
        return me;
 }


@@ -51,7 +53,7 @@ void XonoticProfileTab_fill(entity me)
                me.TD(me, 1, 3.0, box = makeXonoticInputBox(1, "_cl_name"));
                        box.forbiddenCharacters = "\r\n\\\"$"; // don't care, isn't getting saved
                        box.maxLength = -127; // negative means encoded length in bytes
                me.TD(me, 1, 3.0, box = makeXonoticInputBox(1, "_cl_name"));
                        box.forbiddenCharacters = "\r\n\\\"$"; // don't care, isn't getting saved
                        box.maxLength = -127; // negative means encoded length in bytes

-                       box.saveImmediately = 1;
+                       box.saveImmediately = 0;  // Sorry, can't do this, it spams "name" commands.

                        box.enableClearButton = 0;
                        label.textEntity = box;
        me.TR(me);
                        box.enableClearButton = 0;
                        label.textEntity = box;
        me.TR(me);


@@ -142,9 +144,9 @@ void XonoticProfileTab_fill(entity me)
        #if 0
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gender:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("_cl_gender"));
        #if 0
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gender:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("_cl_gender"));

-                       e.addValue(e, ZCTX(_("GENDER^Undisclosed")), "0");
-                       e.addValue(e, ZCTX(_("GENDER^Female")), "1");
-                       e.addValue(e, ZCTX(_("GENDER^Male")), "2");
+                       e.addValue(e, _("Undisclosed"), "0");
+                       e.addValue(e, _("Female"), "1");
+                       e.addValue(e, _("Male"), "2");

                        e.configureXonoticTextSliderValues(e);
        #else
                        me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Gender")));
                        e.configureXonoticTextSliderValues(e);
        #else
                        me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Gender")));