From: otta8634 <k9wolf@pm.me>
Date: Fri, 21 Feb 2025 16:41:04 +0000 (+0800)
Subject: Rename normal_nade_boom to nade_normal_boom
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e2f0fe4398cc595b470112b2deb2beffd2fec4f2;p=xonotic%2Fxonotic-data.pk3dir.git

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 01bd0ca0d..2f5c13511 100644
--- 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 24feb75be..0daba58b1 100644
--- 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 4136fb59d..1e133fdfb 100644
--- 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 76c19eb77..1a5f9f8cf 100644
--- 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 c037315c9..293a9e66f 100644
--- 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)