X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fall.qc;h=8af381f09119b612bfe445a0963ca910be879af0;hb=5f12d827aec80b869ab1f213b14bfaff7dc7d6b5;hp=c236bb47c4d3ef361bc5ac9705e88a78483d1933;hpb=fde04a29ed6f249c904737ae21ff44f400f1f453;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index c236bb47c..8af381f09 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -67,11 +67,11 @@ WepSet _WepSet_FromWeapon(int a)
 				if (a >= 24)
 				{
 					a -= 24;
-					return '0 0 1' * power2of(a);
+					return '0 0 1' * (2 ** a);
 				}
-			return '0 1 0' * power2of(a);
+			return '0 1 0' * (2 ** a);
 		}
-	return '1 0 0' * power2of(a);
+	return '1 0 0' * (2 ** a);
 }
 #ifdef SVQC
 	void WriteWepSet(float dst, WepSet w)
@@ -566,7 +566,10 @@ NET_HANDLE(wframe, bool isNew)
     int slot = ReadByte();
 	bool restartanim = ReadByte();
 	entity wepent = viewmodels[slot];
-	anim_set(wepent, a, !restartanim, restartanim, restartanim);
+	if(a.x == wepent.anim_idle_x) // we don't need to enforce idle animation
+		wepent.animstate_looping = false;
+	else
+		anim_set(wepent, a, !restartanim, restartanim, restartanim);
 	wepent.state = ReadByte();
 	wepent.weapon_nextthink = ReadFloat();
 	switch (wepent.state)