Merge branch 'master' into Mario/vaporizer_damage

[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 59b4860af4c88c1051eaafc5d238b9af7e3572bb..fcbbbbe0e19b6a740576762a673d725b16e21bd4 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc
@@ -7,7 +7,6 @@ CLASS(XonoticEffectsSettingsTab) EXTENDS(XonoticTab)
        ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space
 ENDCLASS(XonoticEffectsSettingsTab)
 entity makeXonoticEffectsSettingsTab();
-float updateCompression();
 #endif
 
 #ifdef IMPLEMENTATION
@@ -23,11 +22,11 @@ float someShadowCvarIsEnabled(entity box)
 {
        if(cvar("r_shadow_realtime_dlight"))
                if(cvar("r_shadow_realtime_dlight_shadows"))
-                       return TRUE;
+                       return true;
        if(cvar("r_shadow_realtime_world"))
                if(cvar("r_shadow_realtime_world_shadows"))
-                       return TRUE;
-       return FALSE;
+                       return true;
+       return false;
 }
 
 void XonoticEffectsSettingsTab_fill(entity me)
@@ -149,9 +148,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);