X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=7914804b9df976219bf2b6112365fd0abc0151f8;hp=da1a180d4c38dad14c8d1678b6edd6e2731ab8fc;hb=a8cc9eb71b0d0e44e9a968a9cf5554f6226cc838;hpb=2d29a97f94a5b28bee1a909ba5e47abf352ac751

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index da1a180d4..7914804b9 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -511,10 +511,10 @@ void PutClientInServer()
 		if(g_weaponarena_random) // WEAPONTODO: more stuff that should be in a mutator. also: rename those cvars
 		{
 			if(g_weaponarena_random_with_blaster)
-				self.weapons &= ~WEPSET_BLASTER;
+				self.weapons &= ~WEPSET(BLASTER);
 			W_RandomWeapons(self, g_weaponarena_random);
 			if(g_weaponarena_random_with_blaster)
-				self.weapons |= WEPSET_BLASTER;
+				self.weapons |= WEPSET(BLASTER);
 		}
 
 		self.items = start_items;
@@ -620,7 +620,8 @@ void PutClientInServer()
 		// reset fields the weapons may use
 		for (int j = WEP_FIRST; j <= WEP_LAST; ++j)
 		{
-			WEP_ACTION(j, WR_RESETPLAYER);
+			Weapon w = get_weaponinfo(j);
+			w.wr_resetplayer(w);
 
 			// all weapons must be fully loaded when we spawn
 			entity e = get_weaponinfo(j);
@@ -1236,7 +1237,7 @@ void ClientConnect (void)
 			Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_MOTD, getwelcomemessage());
 		}
 
-		if(autocvar_g_bugrigs || (g_weaponarena_weapons == WEPSET_TUBA))
+		if(autocvar_g_bugrigs || (g_weaponarena_weapons == WEPSET(TUBA)))
 			stuffcmd(self, "cl_cmd settemp chase_active 1\n");
 	}
 
@@ -2552,7 +2553,7 @@ void PlayerPreThink (void)
 		{
 			self.items &= ~self.items_added;
 
-			W_WeaponFrame();
+			W_WeaponFrame(self);
 
 			self.items_added = 0;
 			if(self.items & ITEM_Jetpack.m_itemid)