X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_common.qc;h=2eca8c2cbbd03e64eaede7854ca99b2b7ad67b75;hb=5c4ae3ec7458cf4e8d07f6eed4fe24fceea13b70;hp=2e0c1e8f02bbcd466773894e43e3da4df52104f5;hpb=4779c1bd8269aaca0d20e802c7e8e685602bb926;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc
index 2e0c1e8f0..2eca8c2cb 100644
--- a/qcsrc/server/w_common.qc
+++ b/qcsrc/server/w_common.qc
@@ -6,13 +6,12 @@ void W_GiveWeapon (entity e, float wep)
 	if (!wep)
 		return;
 
-	WEPSET_OR_EW(e, wep);
+	e.weapons |= WepSet_FromWeapon(wep);
 
 	oldself = self;
 	self = e;
 
-	if not(g_minstagib)
-	if(other.classname == "player")
+	if(IS_PLAYER(other))
 		{ Send_Notification(NOTIF_ONE, other, MSG_MULTI, ITEM_WEAPON_GOT, wep); }
 
 	self = oldself;
@@ -105,7 +104,7 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
 	// Find all non-hit players the beam passed close by
 	if(deathtype == WEP_MINSTANEX || deathtype == WEP_NEX)
 	{
-		FOR_EACH_REALCLIENT(msg_entity) if(msg_entity != self) if(!msg_entity.railgunhit) if not(msg_entity.classname == "spectator" && msg_entity.enemy == self) // we use realclient, so spectators can hear the whoosh too
+		FOR_EACH_REALCLIENT(msg_entity) if(msg_entity != self) if(!msg_entity.railgunhit) if not(IS_SPEC(msg_entity) && msg_entity.enemy == self) // we use realclient, so spectators can hear the whoosh too
 		{
 			// nearest point on the beam
 			beampos = start + dir * bound(0, (msg_entity.origin - start) * dir, length);
@@ -118,7 +117,7 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
 
 			if(!pseudoprojectile)
 				pseudoprojectile = spawn(); // we need this so the sound uses the "entchannel4" volume
-			soundtoat(MSG_ONE, pseudoprojectile, beampos, CH_SHOTS, snd, VOL_BASE * f, ATTN_NONE);
+			soundtoat(MSG_ONE, pseudoprojectile, beampos, CH_SHOTS, snd, VOL_BASE * f, ATTEN_NONE);
 		}
 
 		if(pseudoprojectile)
@@ -220,7 +219,7 @@ void W_BallisticBullet_LeaveSolid_think()
 	self.nextthink = max(time, self.W_BallisticBullet_LeaveSolid_nextthink_save);
 	self.W_BallisticBullet_LeaveSolid_think_save = func_null;
 
-	self.flags &~= FL_ONGROUND;
+	self.flags &= ~FL_ONGROUND;
 
 	if(self.enemy.solid == SOLID_BSP)
 	{
@@ -445,7 +444,7 @@ void fireBallisticBullet(vector start, vector dir, float spread, float pSpeed, f
 		lag = ANTILAG_LATENCY(self);
 		if(lag < 0.001)
 			lag = 0;
-		if(clienttype(self) != CLIENTTYPE_REAL)
+		if not(IS_REAL_CLIENT(self))
 			lag = 0;
 		if(autocvar_g_antilag == 0 || self.cvar_cl_noantilag)
 			lag = 0; // only do hitscan, but no antilag
@@ -618,7 +617,7 @@ void W_PrepareExplosionByDamage(entity attacker, void() explode)
 	self.takedamage = DAMAGE_NO;
 	self.event_damage = func_null;
 	
-	if((attacker.flags & FL_CLIENT) && !autocvar_g_projectiles_keep_owner)
+	if(IS_CLIENT(attacker) && !autocvar_g_projectiles_keep_owner)
 	{
 		self.owner = attacker;
 		self.realowner = attacker;