Re-number mutator args to be more like varargs

diff --git a/qcsrc/client/mutators/events.qh b/qcsrc/client/mutators/events.qh
index f86ef533361699e0e107f6b153d5687975f1ba7c..4cdba48cfa8f9f0df42c481ed81425a42908a219 100644 (file)
--- a/qcsrc/client/mutators/events.qh
+++ b/qcsrc/client/mutators/events.qh
@@ -103,7 +103,7 @@ MUTATOR_HOOKABLE(Ent_Init, EV_NO_ARGS);
 
 #define EV_HUD_Draw_overlay(i, o) \
        /**/ o(vector, MUTATOR_ARGV_0_vector) \
-       /**/ o(float, MUTATOR_ARGV_0_float) \
+       /**/ o(float, MUTATOR_ARGV_1_float) \
        /**/
 MUTATOR_HOOKABLE(HUD_Draw_overlay, EV_HUD_Draw_overlay);
 

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index dadb8d41d95378b78c6891caa6aeb2af93551fb6..125a25709c174f623b7e24fdcc892330180eb268 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1321,7 +1321,7 @@ void HUD_Draw(entity this)
        if(!intermission)
        if (MUTATOR_CALLHOOK(HUD_Draw_overlay))
        {
-               drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, MUTATOR_ARGV(0, vector), autocvar_hud_colorflash_alpha * MUTATOR_ARGV(0, float), DRAWFLAG_ADDITIVE);
+               drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, M_ARGV(0, vector), autocvar_hud_colorflash_alpha * M_ARGV(1, float), DRAWFLAG_ADDITIVE);
        }
        else if(STAT(FROZEN))
        {

diff --git a/qcsrc/common/mutators/events.qh b/qcsrc/common/mutators/events.qh
index 1258b6ff8b2d4a2082bf246e74cf3f9adebe7330..58f9c43d0a89d11b25d5da27088cde095bbbedd1 100644 (file)
--- a/qcsrc/common/mutators/events.qh
+++ b/qcsrc/common/mutators/events.qh
@@ -15,12 +15,19 @@ string ret_string;
     _(x, string) \
     /**/
 
-#define MUTATOR_ARGV(x, type) MUTATOR_ARGV_##x##_##type
+// TODO: migrate to arrays some day when no other globals are used
+#define M_ARGV(x, type) MUTATOR_ARGV_##x##_##type
 #define MUTATOR_NEWGLOBAL(x, type) type MUTATOR_ARGV_##x##_##type;
 
 MUTATOR_TYPES(MUTATOR_NEWGLOBAL, 0)
 MUTATOR_TYPES(MUTATOR_NEWGLOBAL, 1)
 MUTATOR_TYPES(MUTATOR_NEWGLOBAL, 2)
+MUTATOR_TYPES(MUTATOR_NEWGLOBAL, 3)
+MUTATOR_TYPES(MUTATOR_NEWGLOBAL, 4)
+MUTATOR_TYPES(MUTATOR_NEWGLOBAL, 5)
+MUTATOR_TYPES(MUTATOR_NEWGLOBAL, 6)
+MUTATOR_TYPES(MUTATOR_NEWGLOBAL, 7)
+MUTATOR_TYPES(MUTATOR_NEWGLOBAL, 8)
 
 #undef MUTATOR_TYPES
 #undef MUTATOR_NEWGLOBAL
@@ -55,9 +62,9 @@ MUTATOR_HOOKABLE(IsFlying, EV_IsFlying);
 
 #define EV_WP_Format(i, o) \
     /**/ i(entity, MUTATOR_ARGV_0_entity) \
-    /**/ i(string, MUTATOR_ARGV_0_string) \
-    /**/ o(vector, MUTATOR_ARGV_0_vector) \
-    /**/ o(string, MUTATOR_ARGV_0_string) \
+    /**/ i(string, MUTATOR_ARGV_1_string) \
+    /**/ o(vector, MUTATOR_ARGV_2_vector) \
+    /**/ o(string, MUTATOR_ARGV_3_string) \
     /**/
 MUTATOR_HOOKABLE(WP_Format, EV_WP_Format);
 

diff --git a/qcsrc/common/mutators/mutator/buffs/module.inc b/qcsrc/common/mutators/mutator/buffs/module.inc
index 0d6e97cbb5f198dfa4152ea9192ffb5fde8e9bf1..c24892836a88d5a619b17eb4ae1d3ac7746d643b 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/module.inc
+++ b/qcsrc/common/mutators/mutator/buffs/module.inc
@@ -31,13 +31,13 @@ MUTATOR_HOOKFUNCTION(cl_buffs, HUD_Powerups_add)
 }
 MUTATOR_HOOKFUNCTION(cl_buffs, WP_Format)
 {
-    entity this = MUTATOR_ARGV(0, entity);
-    string s = MUTATOR_ARGV(0, string);
+    entity this = M_ARGV(0, entity);
+    string s = M_ARGV(1, string);
     if (s == WP_Buff.netname || s == RADARICON_Buff.netname)
     {
         Buff b = Buffs_from(this.wp_extra);
-        MUTATOR_ARGV(0, vector) = b.m_color;
-        MUTATOR_ARGV(0, string) = b.m_prettyName;
+        M_ARGV(2, vector) = b.m_color;
+        M_ARGV(3, string) = b.m_prettyName;
         return true;
     }
 }

diff --git a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
index 0d9cb73e9caf05bb131c07b186ced0a790083a82..2a1795d63c94afad39c367c52eb0decd51172575 100644 (file)
--- a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
+++ b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
@@ -89,11 +89,11 @@ AUTOCVAR(sv_damagetext, int, 2, _("<= 0: disabled, >= 1: spectators, >= 2: playe
 #define SV_DAMAGETEXT_ALL()             (autocvar_sv_damagetext >= 3 /* all players */)
 MUTATOR_HOOKFUNCTION(damagetext, PlayerDamaged) {
     if (SV_DAMAGETEXT_DISABLED()) return;
-    const entity attacker = MUTATOR_ARGV(0, entity);
-    const entity hit = MUTATOR_ARGV(1, entity); if (hit == attacker) return;
-    const int health = MUTATOR_ARGV(0, int);
-    const int armor = MUTATOR_ARGV(1, int);
-    const int deathtype = MUTATOR_ARGV(2, int);
+    const entity attacker = M_ARGV(0, entity);
+    const entity hit = M_ARGV(1, entity); if (hit == attacker) return;
+    const int health = M_ARGV(2, int);
+    const int armor = M_ARGV(3, int);
+    const int deathtype = M_ARGV(5, int);
     const vector location = hit.origin;
     FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(
         if (

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 6fca6178f53c801ffd848958e50b82d40b2e2c04..d2f90091fda3909848ddc2a8249a593a3cd7ec28 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -39,8 +39,8 @@ REGISTER_MUTATOR(cl_nades, true);
 MUTATOR_HOOKFUNCTION(cl_nades, HUD_Draw_overlay)
 {
        if (STAT(HEALING_ORB) <= time) return false;
-       MUTATOR_ARGV(0, vector) = NADE_TYPE_HEAL.m_color;
-       MUTATOR_ARGV(0, float) = STAT(HEALING_ORB_ALPHA);
+       M_ARGV(0, vector) = NADE_TYPE_HEAL.m_color;
+       M_ARGV(1, float) = STAT(HEALING_ORB_ALPHA);
        return true;
 }
 MUTATOR_HOOKFUNCTION(cl_nades, Ent_Projectile)

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qh b/qcsrc/common/mutators/mutator/nades/nades.qh
index da80327bb24a9ebf31ea5c241e8e5c7483e5c11c..d89cd462d10d9affc727e2bddd701fe63ad670c5 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qh
+++ b/qcsrc/common/mutators/mutator/nades/nades.qh
@@ -91,10 +91,10 @@ void(entity player, float score) nades_GiveBonus;
  */
 #define EV_Nade_Damage(i, o) \
        /** weapon */ i(entity, MUTATOR_ARGV_0_entity) \
-    /** force */  i(vector, MUTATOR_ARGV_0_vector) \
-    /**/          o(vector, MUTATOR_ARGV_0_vector) \
-       /** damage */ i(float,  MUTATOR_ARGV_0_float) \
-    /**/          o(float,  MUTATOR_ARGV_0_float) \
+    /** force */  i(vector, MUTATOR_ARGV_1_vector) \
+    /**/          o(vector, MUTATOR_ARGV_1_vector) \
+       /** damage */ i(float,  MUTATOR_ARGV_2_float) \
+    /**/          o(float,  MUTATOR_ARGV_2_float) \
     /**/
 MUTATOR_HOOKABLE(Nade_Damage, EV_Nade_Damage);
 

diff --git a/qcsrc/common/mutators/mutator/overkill/hmg.qc b/qcsrc/common/mutators/mutator/overkill/hmg.qc
index 419123e10477d5e8983402f2e2a8f73dbe4499af..0d14164d1a0ed03d9cedb6b9f4185be07eb125b4 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/hmg.qc
+++ b/qcsrc/common/mutators/mutator/overkill/hmg.qc
@@ -48,9 +48,9 @@ REGISTER_MUTATOR(hmg_nadesupport, true);
 MUTATOR_HOOKFUNCTION(hmg_nadesupport, Nade_Damage)
 {
     SELFPARAM();
-       if (MUTATOR_ARGV(0, entity) != WEP_HMG) return;
+       if (M_ARGV(0, entity) != WEP_HMG) return;
        return = true;
-       MUTATOR_ARGV(0, float) /* damage */ = self.max_health * 0.1;
+       M_ARGV(2, float) /* damage */ = self.max_health * 0.1;
 }
 
 spawnfunc(weapon_hmg) { weapon_defaultspawnfunc(this, WEP_HMG); }

diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qc b/qcsrc/common/mutators/mutator/overkill/overkill.qc
index c670879e3788e9c8cceff9e3bff4a49614f15b4c..c5c8767423596115b40243014bf700950e66a20b 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/overkill.qc
@@ -41,7 +41,7 @@ REGISTER_MUTATOR(ok, cvar("g_overkill") && !cvar("g_instagib") && !g_nexball &&
 
 MUTATOR_HOOKFUNCTION(ok, W_DecreaseAmmo)
 {
-       entity actor = MUTATOR_ARGV(0, entity);
+       entity actor = M_ARGV(0, entity);
        if (actor.ok_use_ammocharge)
        {
                ok_DecreaseCharge(actor, PS(actor).m_weapon.m_id);
@@ -51,7 +51,7 @@ MUTATOR_HOOKFUNCTION(ok, W_DecreaseAmmo)
 
 MUTATOR_HOOKFUNCTION(ok, W_Reload)
 {
-       entity actor = MUTATOR_ARGV(0, entity);
+       entity actor = M_ARGV(0, entity);
        return actor.ok_use_ammocharge;
 }
 

diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
index 55136ddc5754d2934e88612ba67239bf3e2ab083..e208811ef786b069303dd4988d8281d2d6a5d15d 100644 (file)
--- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
+++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
@@ -235,7 +235,7 @@ vector spritelookupcolor(entity this, string s, vector def)
     if (s == WP_Item.netname    || s == RADARICON_Item.netname) return Items_from(this.wp_extra).m_color;
     if (MUTATOR_CALLHOOK(WP_Format, this, s))
     {
-        return MUTATOR_ARGV(0, vector);
+        return M_ARGV(2, vector);
     }
     return def;
 }
@@ -248,7 +248,7 @@ string spritelookuptext(entity this, string s)
     if (s == WP_Monster.netname) return get_monsterinfo(this.wp_extra).monster_name;
     if (MUTATOR_CALLHOOK(WP_Format, this, s))
     {
-        return MUTATOR_ARGV(0, string);
+        return M_ARGV(3, string);
     }
 
     // need to loop, as our netname could be one of three

diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh
index bfec6f21922c1ec586fa65478bce5d518231e7f0..7221bcb4ce57b0ef87e4246e43bb57f578a08a6e 100644 (file)
--- a/qcsrc/server/mutators/events.qh
+++ b/qcsrc/server/mutators/events.qh
@@ -332,10 +332,10 @@ MUTATOR_HOOKABLE(PlayerDamage_Calculate, EV_PlayerDamage_Calculate);
 #define EV_PlayerDamaged(i, o) \
     /** attacker  */ i(entity, MUTATOR_ARGV_0_entity) \
     /** target    */ i(entity, MUTATOR_ARGV_1_entity) \
-    /** health    */ i(int,    MUTATOR_ARGV_0_int) \
-    /** armor     */ i(int,    MUTATOR_ARGV_1_int) \
-    /** location  */ i(vector, MUTATOR_ARGV_0_vector) \
-    /** deathtype */ i(int,    MUTATOR_ARGV_2_int) \
+    /** health    */ i(int,    MUTATOR_ARGV_2_int) \
+    /** armor     */ i(int,    MUTATOR_ARGV_3_int) \
+    /** location  */ i(vector, MUTATOR_ARGV_4_vector) \
+    /** deathtype */ i(int,    MUTATOR_ARGV_5_int) \
     /**/
 MUTATOR_HOOKABLE(PlayerDamaged, EV_PlayerDamaged);