From: Samual Lenks <samual@xonotic.org>
Date: Tue, 7 Jan 2014 02:50:10 +0000 (-0500)
Subject: Add todo comment, move another throw weapon function
X-Git-Tag: xonotic-v0.8.0~152^2~118
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=c0490599cda1c8d4838e2cd7605f99ebe3b77797;p=xonotic%2Fxonotic-data.pk3dir.git

Add todo comment, move another throw weapon function
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 10b79a517..d91c6c75e 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2429,6 +2429,7 @@ void PlayerPreThink (void)
 		SpectatorThink();
 	}
 
+	// WEAPONTODO: Add weapon request for this
 	if(!zoomstate_set)
 		SetZoomState(self.BUTTON_ZOOM || self.BUTTON_ZOOMSCRIPT || (self.BUTTON_ATCK2 && self.weapon == WEP_VORTEX) || (self.BUTTON_ATCK2 && self.weapon == WEP_RIFLE && WEP_CVAR(rifle, secondary) == 0)); // WEAPONTODO
 
diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 6548912ab..99a50c709 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -138,13 +138,6 @@ void player_anim (void)
 	}
 }
 
-void SpawnThrownWeapon (vector org, float w)
-{
-	if(self.weapons & WepSet_FromWeapon(self.weapon))
-		if(W_IsWeaponThrowable(self.weapon))
-			W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
-}
-
 void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
 	float take, save;
diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 36a7ae679..e5f36b941 100644
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -177,3 +177,10 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
 	if(!a) return;
 	Send_Notification(NOTIF_ONE, self, MSG_MULTI, ITEM_WEAPON_DROP, a, w);
 }
+
+void SpawnThrownWeapon(vector org, float w)
+{
+	if(self.weapons & WepSet_FromWeapon(self.weapon))
+		if(W_IsWeaponThrowable(self.weapon))
+			W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
+}
diff --git a/qcsrc/server/weapons/throwing.qh b/qcsrc/server/weapons/throwing.qh
index 9dd70a67b..c09a8f882 100644
--- a/qcsrc/server/weapons/throwing.qh
+++ b/qcsrc/server/weapons/throwing.qh
@@ -8,3 +8,5 @@ float W_IsWeaponThrowable(float w);
 
 // toss current weapon
 void W_ThrowWeapon(vector velo, vector delta, float doreduce);
+
+void SpawnThrownWeapon(vector org, float w);