From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 10 Dec 2015 02:19:11 +0000 (+1100)
Subject: wframe_send: stop sending switchdelay
X-Git-Tag: xonotic-v0.8.2~1526
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b473445119d19f21fba8b9576beb903c0b762ed;p=xonotic%2Fxonotic-data.pk3dir.git

wframe_send: stop sending switchdelay
---

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index fc3bd9167..b18d6991a 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -562,8 +562,10 @@ NET_HANDLE(wframe, bool isNew)
 	switch (viewmodel.state)
 	{
 		case WS_RAISE:
+			viewmodel.weapon_switchdelay = activeweapon.switchdelay_raise;
+			break;
 		case WS_DROP:
-			viewmodel.weapon_switchdelay = ReadFloat();
+			viewmodel.weapon_switchdelay = activeweapon.switchdelay_drop;
 			break;
         default:
             viewmodel.weapon_switchdelay = 0;
@@ -587,16 +589,6 @@ void wframe_send(entity actor, entity weaponentity, vector a, bool restartanim)
 	WriteByte(channel, weaponentity.state);
 	WriteFloat(channel, weaponentity.weapon_nextthink);
 	WriteByte(channel, weaponentity.m_alpha * 255);
-	Weapon w = Weapons_from(actor.weapon);
-	switch (weaponentity.state)
-	{
-		case WS_RAISE:
-			WriteFloat(channel, w.switchdelay_raise);
-			break;
-		case WS_DROP:
-			WriteFloat(channel, w.switchdelay_drop);
-			break;
-	}
 }
 #endif