Rename normal_nade_boom to nade_normal_boom

This makes it consistent with the other _boom nade function names.

diff --git a/qcsrc/common/mutators/mutator/nades/nade/darkness.qc b/qcsrc/common/mutators/mutator/nades/nade/darkness.qc
index 01bd0ca0decbad7ccd7603e843820bca113ae74f..2f5c135113a5da08a5bd9e4d72ef7a543cbd8d35 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nade/darkness.qc
+++ b/qcsrc/common/mutators/mutator/nades/nade/darkness.qc
@@ -21,7 +21,7 @@ void nade_darkness_think(entity this)
                        Send_Effect_Except(expef, this.origin + '0 0 1', '0 0 0', 1, expcol_min, expcol_max, NULL);
                        sound(this, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
 
-                       normal_nade_boom(this);
+                       nade_normal_boom(this);
                }
                else
                        Send_Effect_Except(EFFECT_SPAWN, this.origin + '0 0 1', '0 0 0', 1, '0.5 0 0.5', '0.5 0 0.5', NULL);

diff --git a/qcsrc/common/mutators/mutator/nades/nade/ice.qc b/qcsrc/common/mutators/mutator/nades/nade/ice.qc
index 24feb75be6c8fb0bfa7040a8570ba818548dd384..0daba58b19853907a2cc37a218916dce0c2c6ebb 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nade/ice.qc
+++ b/qcsrc/common/mutators/mutator/nades/nade/ice.qc
@@ -29,7 +29,7 @@ void nade_ice_think(entity this)
                        Send_Effect_Except(expef, this.origin + '0 0 1', '0 0 0', 1, expcol_min, expcol_max, NULL);
                        sound(this, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
 
-                       normal_nade_boom(this);
+                       nade_normal_boom(this);
                }
                delete(this);
                return;

diff --git a/qcsrc/common/mutators/mutator/nades/nade/normal.qc b/qcsrc/common/mutators/mutator/nades/nade/normal.qc
index 4136fb59d2cc3e54d085d105b93b9eb3e6344812..1e133fdfb19f333c988978e4cbf2dc5d4c78d62f 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nade/normal.qc
+++ b/qcsrc/common/mutators/mutator/nades/nade/normal.qc
@@ -1,7 +1,7 @@
 #include "normal.qh"
 
 #ifdef SVQC
-void normal_nade_boom(entity this)
+void nade_normal_boom(entity this)
 {
        RadiusDamage(this, this.realowner, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage,
                autocvar_g_nades_nade_radius, this, NULL, autocvar_g_nades_nade_force, this.projectiledeathtype, DMG_NOWEP, this.enemy);

diff --git a/qcsrc/common/mutators/mutator/nades/nade/normal.qh b/qcsrc/common/mutators/mutator/nades/nade/normal.qh
index 76c19eb770b1bbfcb69dbbd981b64acbec3afbea..1a5f9f8cfa98080381bdd1d2bf0b639f9ee39262 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nade/normal.qh
+++ b/qcsrc/common/mutators/mutator/nades/nade/normal.qh
@@ -3,7 +3,7 @@
 #include <common/mutators/mutator/nades/nades.qh>
 
 #ifdef SVQC
-void normal_nade_boom(entity this);
+void nade_normal_boom(entity this);
 #endif // SVQC
 
 CLASS(NormalNade, Nade)

diff --git a/qcsrc/common/mutators/mutator/nades/sv_nades.qc b/qcsrc/common/mutators/mutator/nades/sv_nades.qc
index c037315c969e50981c8c87d0db6577ebab8458f4..293a9e66fe217da03c95256fada765f997bade9a 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/sv_nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/sv_nades.qc
@@ -144,7 +144,7 @@ void nade_boom(entity this)
        this.event_damage = func_null; // prevent somehow calling damage in the next call
 
        if(ntype == NADE_TYPE_NORMAL)
-               normal_nade_boom(this);
+               nade_normal_boom(this);
 
        if(this.takedamage)
        switch(ntype)