Merge branch 'master' into TimePath/global_self

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / damagetext.qc

diff --git a/qcsrc/common/mutators/mutator/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext.qc
index ef673d015450e8edf76c877f13fb360eb899a480..8d21f17057a1da4baf5770f618d73f720fb0bccb 100644 (file)
--- a/qcsrc/common/mutators/mutator/damagetext.qc
+++ b/qcsrc/common/mutators/mutator/damagetext.qc
@@ -1,27 +1,18 @@
 REGISTER_MUTATOR(damagetext, true);
 
-#ifdef CSQC
-bool autocvar_cl_damagetext = false;
-string autocvar_cl_damagetext_format = "-%3$d";
-vector autocvar_cl_damagetext_color = '1 1 0';
-float autocvar_cl_damagetext_size = 8;
-float autocvar_cl_damagetext_alpha_start = 1;
-float autocvar_cl_damagetext_alpha_lifetime = 3;
-vector autocvar_cl_damagetext_velocity = '0 0 20';
-vector autocvar_cl_damagetext_offset = '0 -40 0';
-float autocvar_cl_damagetext_accumulate_range = 30;
-STATIC_INIT(cl_damagetext) {
-    CVAR_DESCRIBE(cl_damagetext, _("Draw damage dealt. 0: disabled, 1: enabled"));
-    CVAR_DESCRIBESTR(cl_damagetext_format, _("How to format the damage text. 1$ is health, 2$ is armor, 3$ is both"));
-    CVAR_DESCRIBEVEC(cl_damagetext_color, _("Default damage text color"));
-    CVAR_DESCRIBE(cl_damagetext_size, _("Damage text font size"));
-    CVAR_DESCRIBE(cl_damagetext_alpha_start, _("Damage text initial alpha"));
-    CVAR_DESCRIBE(cl_damagetext_alpha_lifetime, _("Damage text lifetime in seconds"));
-    CVAR_DESCRIBEVEC(cl_damagetext_velocity, _("Damage text move direction"));
-    CVAR_DESCRIBEVEC(cl_damagetext_offset, _("Damage text offset"));
-    CVAR_DESCRIBE(cl_damagetext_accumulate_range, _("Damage text spawned within this range is accumulated"));
-}
+#if defined(CSQC) || defined(MENUQC)
+AUTOCVAR_SAVE(cl_damagetext,                    bool,   false,      _("Draw damage dealt. 0: disabled, 1: enabled"));
+AUTOCVAR_SAVE(cl_damagetext_format,             string, "-%3$d",    _("How to format the damage text. 1$ is health, 2$ is armor, 3$ is both"));
+AUTOCVAR_SAVE(cl_damagetext_color,              vector, '1 1 0',    _("Default damage text color"));
+AUTOCVAR_SAVE(cl_damagetext_size,               float,  8,          _("Damage text font size"));
+AUTOCVAR_SAVE(cl_damagetext_alpha_start,        float,  1,          _("Damage text initial alpha"));
+AUTOCVAR_SAVE(cl_damagetext_alpha_lifetime,     float,  3,          _("Damage text lifetime in seconds"));
+AUTOCVAR_SAVE(cl_damagetext_velocity,           vector, '0 0 20',   _("Damage text move direction"));
+AUTOCVAR_SAVE(cl_damagetext_offset,             vector, '0 -40 0',  _("Damage text offset"));
+AUTOCVAR_SAVE(cl_damagetext_accumulate_range,   float,  30,         _("Damage text spawned within this range is accumulated"));
+#endif
 
+#ifdef CSQC
 CLASS(DamageText, Object)
     ATTRIB(DamageText, m_color, vector, autocvar_cl_damagetext_color)
     ATTRIB(DamageText, m_size, float, autocvar_cl_damagetext_size)
@@ -34,7 +25,7 @@ CLASS(DamageText, Object)
     ATTRIB(DamageText, time_prev, float, time)
 
     void DamageText_draw() {
-        entity this = self;
+        SELFPARAM();
         float dt = time - this.time_prev;
         this.time_prev = time;
         setorigin(this, this.origin + dt * this.velocity);
@@ -65,10 +56,7 @@ ENDCLASS(DamageText)
 #endif
 
 #ifdef SVQC
-int autocvar_sv_damagetext = 2;
-STATIC_INIT(sv_damagetext) {
-    CVAR_DESCRIBE(sv_damagetext, _("<= 0: disabled, >= 1: spectators, >= 2: players, >= 3: all players"));
-}
+AUTOCVAR(sv_damagetext, int, 2, _("<= 0: disabled, >= 1: spectators, >= 2: players, >= 3: all players"));
 #define SV_DAMAGETEXT_DISABLED()        (autocvar_sv_damagetext <= 0 /* disabled */)
 #define SV_DAMAGETEXT_SPECTATORS_ONLY() (autocvar_sv_damagetext >= 1 /* spectators only */)
 #define SV_DAMAGETEXT_PLAYERS()         (autocvar_sv_damagetext >= 2 /* players */)
@@ -122,3 +110,34 @@ MUTATOR_HOOKFUNCTION(damagetext, CSQC_Parse_TempEntity) {
     return true;
 }
 #endif
+
+#ifdef MENUQC
+#include "../../../menu/xonotic/tab.qc"
+CLASS(XonoticDamageTextSettings, XonoticTab)
+    #include "../../../menu/gamesettings.qh"
+    REGISTER_SETTINGS(damagetext, NEW(XonoticDamageTextSettings));
+    ATTRIB(XonoticDamageTextSettings, title, string, _("Damage text"))
+    ATTRIB(XonoticDamageTextSettings, intendedWidth, float, 0.9)
+    ATTRIB(XonoticDamageTextSettings, rows, float, 13)
+    ATTRIB(XonoticDamageTextSettings, columns, float, 5)
+    INIT(XonoticDamageTextSettings) { this.configureDialog(this); }
+    METHOD(XonoticDamageTextSettings, showNotify, void(entity this)) { loadAllCvars(this); }
+    METHOD(XonoticDamageTextSettings, fill, void(entity this))
+    {
+        this.gotoRC(this, 0, 1); this.setFirstColumn(this, this.currentColumn);
+            this.TD(this, 1, 3, makeXonoticCheckBox(0, "cl_damagetext", _("Draw damage numbers")));
+        this.TR(this);
+            this.TD(this, 1, 1, makeXonoticTextLabel(0, _("Font size:")));
+            this.TD(this, 1, 2, makeXonoticSlider(0, 50, 1, "cl_damagetext_size"));
+        this.TR(this);
+            this.TD(this, 1, 1, makeXonoticTextLabel(0, _("Accumulate range:")));
+            this.TD(this, 1, 2, makeXonoticSlider(0, 500, 1, "cl_damagetext_accumulate_range"));
+        this.TR(this);
+            this.TD(this, 1, 1, makeXonoticTextLabel(0, _("Lifetime:")));
+            this.TD(this, 1, 2, makeXonoticSlider(0, 10, 1, "cl_damagetext_alpha_lifetime"));
+        this.TR(this);
+            this.TD(this, 1, 1, makeXonoticTextLabel(0, _("Color:")));
+            this.TD(this, 2, 2, makeXonoticColorpickerString("cl_damagetext_color", "cl_damagetext_color"));
+    }
+ENDCLASS(XonoticDamageTextSettings)
+#endif