Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
index fc7e3a136abb12250ac5af16ca22e38d4b7187f9..941daa7922ecf70ac744ba5c7ffb5f4c8c4de2e5 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
@@ -1,9 +1,9 @@
-#ifdef INTERFACE
-CLASS(XonoticGameHUDSettingsTab) EXTENDS(XonoticTab)
-       //METHOD(XonoticGameHUDSettingsTab, toString, string(entity))
+#ifndef DIALOG_SETTINGS_GAME_HUD_H
+#define DIALOG_SETTINGS_GAME_HUD_H
+#include "tab.qc"
+CLASS(XonoticGameHUDSettingsTab, XonoticTab)

        METHOD(XonoticGameHUDSettingsTab, fill, void(entity))
        METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity))
        METHOD(XonoticGameHUDSettingsTab, fill, void(entity))
        METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity))

-       ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD"))

        ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2)
        ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2)


@@ -31,7 +31,7 @@ void XonoticGameHUDSettingsTab_showNotify(entity me)
 entity makeXonoticGameHUDSettingsTab()
 {
        entity me;
 entity makeXonoticGameHUDSettingsTab()
 {
        entity me;

-       me = spawnXonoticGameHUDSettingsTab();
+       me = NEW(XonoticGameHUDSettingsTab);

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


@@ -142,9 +142,9 @@ void XonoticGameHUDSettingsTab_fill(entity me)
                me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Decolorize:")));
                        setDependent(e, "hud_shownames", 1, 1);
                me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_shownames_decolorize"));
                me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Decolorize:")));
                        setDependent(e, "hud_shownames", 1, 1);
                me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_shownames_decolorize"));

-                       e.addValue(e, ZCTX(_("Never")), "0");
-                       e.addValue(e, ZCTX(_("Teamplay")), "1");
-                       e.addValue(e, ZCTX(_("Always")), "2");
+                       e.addValue(e, _("Never"), "0");
+                       e.addValue(e, _("Teamplay"), "1");
+                       e.addValue(e, _("Always"), "2");

                        e.configureXonoticTextSliderValues(e);
                        setDependent(e, "hud_shownames", 1, 1);
 
                        e.configureXonoticTextSliderValues(e);
                        setDependent(e, "hud_shownames", 1, 1);