From: Mario <mario.mario@y7mail.com>
Date: Mon, 30 Dec 2013 11:44:10 +0000 (+1100)
Subject: Update shotgun function names
X-Git-Tag: xonotic-v0.8.0~152^2~203
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff7c30c732c479149ffa4e722bc7fa869055a222;p=xonotic%2Fxonotic-data.pk3dir.git

Update shotgun function names
---

diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc
index 4878017d7..2d92ffda8 100644
--- a/qcsrc/common/weapons/w_shotgun.qc
+++ b/qcsrc/common/weapons/w_shotgun.qc
@@ -1,7 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(
 /* WEP_##id  */ SHOTGUN,
-/* function  */ w_shotgun,
+/* function  */ W_Shotgun,
 /* ammotype  */ ammo_none,
 /* impulse   */ 2,
 /* flags     */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED,
@@ -75,7 +75,7 @@ void W_Shotgun_Attack (void)
 
 .float swing_prev;
 .entity swing_alreadyhit;
-void shotgun_meleethink (void)
+void W_Shotgun_Melee_Think()
 {
 	// declarations
 	float i, f, swing, swing_factor, swing_damage, meleetime, is_player;
@@ -179,7 +179,7 @@ void W_Shotgun_Attack2 (void)
 	entity meleetemp;
 	meleetemp = spawn();
 	meleetemp.realowner = self;
-	meleetemp.think = shotgun_meleethink;
+	meleetemp.think = W_Shotgun_Melee_Think;
 	meleetemp.nextthink = time + WEP_CVAR_SEC(shotgun, melee_delay) * W_WeaponRateFactor();
 	W_SetupShot_Range(self, TRUE, 0, "", 0, WEP_CVAR_SEC(shotgun, damage), WEP_CVAR_SEC(shotgun, melee_range));
 }
@@ -188,7 +188,7 @@ void spawnfunc_weapon_shotgun(); // defined in t_items.qc
 
 .float shotgun_primarytime;
 
-float w_shotgun(float req)
+float W_Shotgun(float req)
 {
 	switch(req)
 	{
@@ -286,7 +286,7 @@ float w_shotgun(float req)
 #endif
 #ifdef CSQC
 .float prevric;
-float w_shotgun(float req)
+float W_Shotgun(float req)
 {
 	switch(req)
 	{