From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 22 Jan 2011 13:07:19 +0000 (+0200)
Subject: Fix some code that was defined in the client part of the weapons code by mistake
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~121
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c54ba5966134c1205b49d3783bf108b22392f47;p=xonotic%2Fxonotic-data.pk3dir.git

Fix some code that was defined in the client part of the weapons code by mistake
---

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 604efbe1c..7e463f56b 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -700,6 +700,10 @@ float w_crylink(float req)
 		else
 			return self.ammo_cells >= autocvar_g_balance_crylink_secondary_ammo;
 	}
+	else if (req == WR_RELOAD)
+	{
+		W_Crylink_Reload();
+	}
 	return TRUE;
 };
 #endif
@@ -741,10 +745,6 @@ float w_crylink(float req)
 		else
 			w_deathtypestring = "%s took a close look at %s's Crylink"; // unchecked: SECONDARY
 	}
-	else if (req == WR_RELOAD)
-	{
-		W_Crylink_Reload();
-	}
 	return TRUE;
 }
 #endif
diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index e0f0748f4..91c104fba 100644
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -467,6 +467,10 @@ float w_fireball(float req)
 	{
 		self.fireball_primarytime = time;
 	}
+	else if (req == WR_RELOAD)
+	{
+		W_Fireball_Reload();
+	}
 	return TRUE;
 };
 #endif
@@ -523,10 +527,6 @@ float w_fireball(float req)
 				w_deathtypestring = "%s tasted %s's fireball";
 		}
 	}
-	else if (req == WR_RELOAD)
-	{
-		W_Fireball_Reload();
-	}
 	return TRUE;
 }
 #endif
diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index ddd5eacf4..d01194b0b 100644
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -435,6 +435,10 @@ float w_glauncher(float req)
 		else
 			return self.ammo_rockets >= autocvar_g_balance_grenadelauncher_secondary_ammo;
 	}
+	else if (req == WR_RELOAD)
+	{
+		W_GrenadeLauncher_Reload();
+	}
 	return TRUE;
 };
 #endif
@@ -470,10 +474,6 @@ float w_glauncher(float req)
 		else // unchecked: SECONDARY, BOUNCE
 			w_deathtypestring = "%s ate %s's grenade";
 	}
-	else if (req == WR_RELOAD)
-	{
-		W_GrenadeLauncher_Reload();
-	}
 	return TRUE;
 }
 #endif