X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=61b5add2bbd3b0e9a5bb47109add2f574cb62df6;hb=c092ab283a53142d3c9658bab30ec38e21e44f8c;hp=da013fc75d0eebe984ebc4a39717489d47d72f45;hpb=e43e7c53656c43e51786d3584e6ea9aa6526230e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index da013fc75..61b5add2b 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -128,7 +128,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 		culprit = DEATH_WEAPONOF(deathtype);
 		if(!culprit)
 			culprit = attacker.weapon;
-		else if(!WEPSET_CONTAINS_EW(attacker, culprit))
+		else if(!(attacker.weapons & WepSet_FromWeapon(culprit)))
 			culprit = attacker.weapon;
 
 		if(g_weaponarena_random_with_laser && culprit == WEP_LASER)
@@ -144,26 +144,26 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 			}
 
 			if(inWarmupStage)
-				WEPSET_COPY_EA(GiveFrags_randomweapons, warmup_start_weapons);
+				GiveFrags_randomweapons.weapons = warmup_start_weapons;
 			else
-				WEPSET_COPY_EA(GiveFrags_randomweapons, start_weapons);
+				GiveFrags_randomweapons.weapons = start_weapons;
 
 			// all others (including the culprit): remove
-			WEPSET_ANDNOT_EE(GiveFrags_randomweapons, attacker);
-			WEPSET_ANDNOT_EW(GiveFrags_randomweapons, culprit);
+			GiveFrags_randomweapons.weapons &= ~attacker.weapons;
+			GiveFrags_randomweapons.weapons &= ~WepSet_FromWeapon(culprit);
 
 			// among the remaining ones, choose one by random
 			W_RandomWeapons(GiveFrags_randomweapons, 1);
 
-			if(!WEPSET_EMPTY_E(GiveFrags_randomweapons))
+			if(GiveFrags_randomweapons.weapons)
 			{
-				WEPSET_OR_EE(attacker, GiveFrags_randomweapons);
-				WEPSET_ANDNOT_EW(attacker, culprit);
+				attacker.weapons |= GiveFrags_randomweapons.weapons;
+				attacker.weapons &= ~WepSet_FromWeapon(culprit);
 			}
 		}
 
 		// after a frag, choose another random weapon set
-		if not(WEPSET_CONTAINS_EW(attacker, attacker.weapon))
+		if not(attacker.weapons & WepSet_FromWeapon(attacker.weapon))
 			W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker));
 	}
 
@@ -626,13 +626,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 						{
 							attacker.dmg_team = attacker.dmg_team + damage;
 							complainteamdamage = attacker.dmg_team - autocvar_g_teamdamage_threshold;
-							if(complainteamdamage > 0 && !g_ca) // FIXME why is g_ca ruled out here? Why not just g_mirrordamage 0 on CA servers?
+							if(complainteamdamage > 0)
 								mirrordamage = autocvar_g_mirrordamage * complainteamdamage;
 							mirrorforce = autocvar_g_mirrordamage * vlen(force);
-							if(g_ca)
-								damage = 0;
-							else
-								damage = autocvar_g_friendlyfire * damage;
+							damage = autocvar_g_friendlyfire * damage;
 							// mirrordamage will be used LATER
 
 							if(autocvar_g_mirrordamage_virtual)
@@ -708,7 +705,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
 		if (targ == attacker)
 		{
-			if(g_ca || (g_cts && !autocvar_g_cts_selfdamage))
+			if(g_cts && !autocvar_g_cts_selfdamage)
 				damage = 0;
 			else
 				damage = damage * autocvar_g_balance_selfdamagepercent;	// Partial damage if the attacker hits himself
@@ -772,7 +769,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 	// apply push
 	if (self.damageforcescale)
 	if (vlen(force))
-	if (!IS_PLAYER(self) || time >= self.spawnshieldtime || g_midair)
+	if (!IS_PLAYER(self) || time >= self.spawnshieldtime)
 	{
 		vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor);
 		if(self.movetype == MOVETYPE_PHYSICS)
@@ -791,7 +788,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 		}
 		else
 			self.velocity = self.velocity + farce;
-		self.flags &~= FL_ONGROUND;
+		self.flags &= ~FL_ONGROUND;
 		UpdateCSQCProjectile(self);
 	}
 	// apply damage
@@ -1230,7 +1227,7 @@ void Fire_ApplyEffect(entity e)
 	if(Fire_IsBurning(e))
 		e.effects |= EF_FLAME;
 	else
-		e.effects &~= EF_FLAME;
+		e.effects &= ~EF_FLAME;
 }
 
 void fireburner_think()