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

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc
index 811cb0998f2774588359af13bee781431b1619f7..d06465082b395303a4a1857c4982c7bb7f6258a2 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc
@@ -1,7 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticEffectsSettingsTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_SETTINGS_EFFECTS_H
+#define DIALOG_SETTINGS_EFFECTS_H
+#include "tab.qc"
+CLASS(XonoticEffectsSettingsTab, XonoticTab)
        METHOD(XonoticEffectsSettingsTab, fill, void(entity))
-       ATTRIB(XonoticEffectsSettingsTab, title, string, _("Effects"))
        ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticEffectsSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space
@@ -13,7 +14,7 @@ entity makeXonoticEffectsSettingsTab();
 entity makeXonoticEffectsSettingsTab()
 {
        entity me;
-       me = spawnXonoticEffectsSettingsTab();
+       me = NEW(XonoticEffectsSettingsTab);
        me.configureDialog(me);
        return me;
 }
@@ -148,9 +149,9 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TDempty(me, 0.2);
                me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Damage effects:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_damageeffect"));
-                       e.addValue(e, _("Disabled"), "0");
+                       e.addValue(e, ZCTX(_("DMGFX^Disabled")), "0");
                        e.addValue(e, _("Skeletal"), "1");
-                       e.addValue(e, _("All"), "2");
+                       e.addValue(e, ZCTX(_("DMGFX^All")), "2");
                        e.configureXonoticTextSliderValues(e);
 
        me.gotoRC(me, 1.25, 3.2); me.setFirstColumn(me, me.currentColumn);