From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 22 Jan 2011 23:07:48 +0000 (+0200)
Subject: return true in WR_SWITCHABLE for all non-reloadable weapons
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~95
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=725df35b0b66e7a9467735e9565898b4bd42d2c1;p=xonotic%2Fxonotic-data.pk3dir.git

return true in WR_SWITCHABLE for all non-reloadable weapons
---

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index 9c8c63c11..ccf43ac18 100644
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -252,6 +252,11 @@ float w_hook(float req)
 	{
 		self.hook_refire = time;
 	}
+	else if (req == WR_SWITCHABLE)
+	{
+		// no reloading system, return true
+		return TRUE;
+	}
 	return TRUE;
 };
 #endif
diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index 6d2981ae2..551f30ce0 100644
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -284,6 +284,11 @@ float w_porto(float req)
 	{
 		self.porto_current = world;
 	}
+	else if (req == WR_SWITCHABLE)
+	{
+		// no reloading system, return true
+		return TRUE;
+	}
 	return TRUE;
 };
 #endif
diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 92d7413d6..1a62d02c2 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -250,6 +250,11 @@ float w_tuba(float req)
 		return TRUE; // TODO use fuel?
 	else if (req == WR_CHECKAMMO2)
 		return TRUE; // TODO use fuel?
+	else if (req == WR_SWITCHABLE)
+	{
+		// no reloading system, return true
+		return TRUE;
+	}
 	return TRUE;
 };
 #endif