X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fweaponsystem.qc;h=011d5cbc11b19c13ca5b946d4dd75fabd4e9f51c;hb=defe7ea25b8d1cc20b5c302104854db5666e6fcc;hp=8bfcbb79cfb37d58734f12493f2e3f922d844ea7;hpb=c2f067fea43512b93f76dee00ba5eb11d7215c93;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 8bfcbb79c..011d5cbc1 100644
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -559,7 +559,7 @@ void W_WeaponFrame(Player actor, .entity weaponentity)
 	// server framerate is very low and the weapon fire rate very high
 	for (int c = 0; c < W_TICSPERFRAME; ++c)
 	{
-		if (w != WEP_Null && !(actor.weapons & WepSet_FromWeapon(w)))
+		if (w != WEP_Null && !(STAT(WEAPONS, actor) & WepSet_FromWeapon(w)))
 		{
 			if (this.m_weapon == this.m_switchweapon) W_SwitchWeapon_Force(actor, w_getbestweapon(actor, weaponentity), weaponentity);
 			w = WEP_Null;
@@ -576,7 +576,7 @@ void W_WeaponFrame(Player actor, .entity weaponentity)
 				key_pressed = false;
 
 			Weapon off = actor.offhand;
-			if (off && (!(actor.weapons & WEPSET(HOOK)) || off != OFFHAND_HOOK))
+			if (off && (!(STAT(WEAPONS, actor) & WEPSET(HOOK)) || off != OFFHAND_HOOK))
 			{
 				if (off.offhand_think) off.offhand_think(off, actor, key_pressed);
 			}