X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weaponsystem.qc;fp=qcsrc%2Fserver%2Fcl_weaponsystem.qc;h=405904565e187a02dfc5552a2e6f5a3adce1783f;hb=30e9db455abe691a3560555a989beb382b3b2531;hp=afabe1820284522acf4d4dc0211d610d277de559;hpb=58b8eafbf5e2ff9147477e115292246458c4c5eb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index afabe1820..405904565 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -93,12 +93,12 @@ void W_HitPlotAnalysis(entity player, vector screenforward, vector screenright,
 		lag = ANTILAG_LATENCY(player);
 		if(lag < 0.001)
 			lag = 0;
-		if(clienttype(player) != CLIENTTYPE_REAL)
+		if not(IS_REAL_CLIENT(player))
 			lag = 0; // only antilag for clients
 
 		org = player.origin + player.view_ofs;
 		traceline_antilag_force(player, org, org + screenforward * MAX_SHOT_DISTANCE, MOVE_NORMAL, player, lag);
-		if(trace_ent.flags & FL_CLIENT)
+		if(IS_CLIENT(trace_ent))
 		{
 			antilag_takeback(trace_ent, time - lag);
 			hitplot = W_HitPlotNormalizedUntransform(org, trace_ent, screenforward, screenright, screenup, trace_endpos);
@@ -198,7 +198,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 			if (!trace_ent.takedamage)
 			{
 				traceline_antilag_force (ent, w_shotorg, w_shotorg + w_shotdir * range, MOVE_NORMAL, ent, ANTILAG_LATENCY(ent));
-				if (trace_ent.takedamage && trace_ent.classname == "player")
+				if (trace_ent.takedamage && IS_PLAYER(trace_ent))
 				{
 					entity e;
 					e = trace_ent;
@@ -214,7 +214,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 			if (ent.cursor_trace_ent)                 // client was aiming at someone
 			if (ent.cursor_trace_ent != ent)         // just to make sure
 			if (ent.cursor_trace_ent.takedamage)      // and that person is killable
-			if (ent.cursor_trace_ent.classname == "player") // and actually a player
+			if (IS_PLAYER(ent.cursor_trace_ent)) // and actually a player
 			{
 				// verify that the shot would miss without antilag
 				// (avoids an issue where guns would always shoot at their origin)
@@ -256,7 +256,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 float CL_Weaponentity_CustomizeEntityForClient()
 {
 	self.viewmodelforclient = self.owner;
-	if(other.classname == "spectator")
+	if(IS_SPEC(other))
 		if(other.enemy == self.owner)
 			self.viewmodelforclient = other;
 	return TRUE;
@@ -696,7 +696,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 			if (!f)
 			{
 				if (complain)
-				if(clienttype(cl) == CLIENTTYPE_REAL)
+				if(IS_REAL_CLIENT(cl))
 				{
 					play2(cl, "weapons/unavailable.wav");
 					Send_WeaponComplain (cl, wpn, W_Name(wpn), 0);
@@ -1353,7 +1353,7 @@ void W_Reload(float sent_ammo_min, float sent_ammo_amount, float sent_time, stri
 	if(!self.(self.current_ammo) && self.reload_ammo_min)
 	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 	{
-		if(clienttype(self) == CLIENTTYPE_REAL && self.reload_complain < time)
+		if(IS_REAL_CLIENT(self) && self.reload_complain < time)
 		{
 			play2(self, "weapons/unavailable.wav");
 			sprint(self, strcat("You don't have enough ammo to reload the ^2", W_Name(self.weapon), "\n"));