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

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_input.qc b/qcsrc/menu/xonotic/dialog_settings_input.qc
index 57b6cef630d6e171bb2c31441b26a88338049b02..f8e53c03a9fd069804bb0e9a37d8a4a2da6c9aef 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_input.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_input.qc
@@ -1,7 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_SETTINGS_INPUT_H
+#define DIALOG_SETTINGS_INPUT_H
+#include "tab.qc"
+CLASS(XonoticInputSettingsTab, XonoticTab)

        METHOD(XonoticInputSettingsTab, fill, void(entity))
        METHOD(XonoticInputSettingsTab, fill, void(entity))

-       ATTRIB(XonoticInputSettingsTab, title, string, _("Input"))

        ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticInputSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space
        ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticInputSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space


@@ -13,7 +14,7 @@ entity makeXonoticInputSettingsTab();
 entity makeXonoticInputSettingsTab()
 {
        entity me;
 entity makeXonoticInputSettingsTab()
 {
        entity me;

-       me = spawnXonoticInputSettingsTab();
+       me = NEW(XonoticInputSettingsTab);

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


@@ -87,15 +88,15 @@ void XonoticInputSettingsTab_fill(entity me)
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("Pressing \"enter console\" key also closes it")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_movement_track_canjump", _("Automatically repeat jumping if holding jump")));
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("Pressing \"enter console\" key also closes it")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_movement_track_canjump", _("Automatically repeat jumping if holding jump")));

-                       e.sendCvars = TRUE;
+                       e.sendCvars = true;

        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Jetpack on jump:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_jetpack_jump"));
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Jetpack on jump:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_jetpack_jump"));

-                       e.addValue(e, _("Disabled"), "0");
+                       e.addValue(e, ZCTX(_("JPJUMP^Disabled")), "0");

                        e.addValue(e, _("Air only"), "1");
                        e.addValue(e, _("Air only"), "1");

-                       e.addValue(e, _("All"), "2");
+                       e.addValue(e, ZCTX(_("JPJUMP^All")), "2");

                        e.configureXonoticTextSliderValues(e);
                        e.configureXonoticTextSliderValues(e);

-                       e.sendCvars = TRUE;
+                       e.sendCvars = true;

        me.TR(me);
                if(cvar_type("joy_enable") & CVAR_TYPEFLAG_ENGINE)
                {
        me.TR(me);
                if(cvar_type("joy_enable") & CVAR_TYPEFLAG_ENGINE)
                {