X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=ca715c722800f22787f164e7af18837fb5f6eb37;hb=3589bb7872babf0ee489a54c85c9213562c1ffe9;hp=866586e7d93c97859836227e27bb1a70316c0c81;hpb=6a52ab75ebcb03896b2520de3a18f874c86b214d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 866586e7d..ca715c722 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -10,9 +10,9 @@
 #include "weapons/accuracy.qh"
 #include "weapons/csqcprojectile.qh"
 #include "weapons/selection.qh"
-#include "../common/buffs.qh"
+#include "../common/buffs/all.qh"
 #include "../common/constants.qh"
-#include "../common/deathtypes.qh"
+#include "../common/deathtypes/all.qh"
 #include "../common/notifications.qh"
 #include "../common/movetypes/movetypes.qh"
 #include "../common/playerstats.qh"
@@ -22,8 +22,8 @@
 #include "../csqcmodellib/sv_model.qh"
 #include "../warpzonelib/common.qh"
 
-float Damage_DamageInfo_SendEntity(entity to, int sf)
-{SELFPARAM();
+bool Damage_DamageInfo_SendEntity(entity this, entity to, int sf)
+{
 	WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEINFO);
 	WriteShort(MSG_ENTITY, self.projectiledeathtype);
 	WriteCoord(MSG_ENTITY, floor(self.origin.x));
@@ -98,14 +98,13 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype)
 	if(g_weaponarena_random)
 	{
 		// after a frag, exchange the current weapon (or the culprit, if detectable) by a new random weapon
-		float culprit;
-		culprit = DEATH_WEAPONOF(deathtype);
+		Weapon culprit = DEATH_WEAPONOF(deathtype);
 		if(!culprit)
-			culprit = attacker.weapon;
-		else if(!(attacker.weapons & WepSet_FromWeapon(culprit)))
-			culprit = attacker.weapon;
+			culprit = get_weaponinfo(attacker.weapon);
+		else if(!(attacker.weapons & WepSet_FromWeapon(culprit.m_id)))
+			culprit = get_weaponinfo(attacker.weapon);
 
-		if(g_weaponarena_random_with_blaster && culprit == WEP_BLASTER.m_id) // WEAPONTODO: Shouldn't this be in a mutator?
+		if(g_weaponarena_random_with_blaster && culprit == WEP_BLASTER) // WEAPONTODO: Shouldn't this be in a mutator?
 		{
 			// no exchange
 		}
@@ -124,7 +123,7 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype)
 
 			// all others (including the culprit): remove
 			GiveFrags_randomweapons.weapons &= ~attacker.weapons;
-			GiveFrags_randomweapons.weapons &= ~WepSet_FromWeapon(culprit);
+			GiveFrags_randomweapons.weapons &= ~WepSet_FromWeapon(culprit.m_id);
 
 			// among the remaining ones, choose one by random
 			W_RandomWeapons(GiveFrags_randomweapons, 1);
@@ -132,7 +131,7 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype)
 			if(GiveFrags_randomweapons.weapons)
 			{
 				attacker.weapons |= GiveFrags_randomweapons.weapons;
-				attacker.weapons &= ~WepSet_FromWeapon(culprit);
+				attacker.weapons &= ~WepSet_FromWeapon(culprit.m_id);
 			}
 		}
 
@@ -203,7 +202,7 @@ void Obituary_SpecialDeath(
 {
 	if(DEATH_ISSPECIAL(deathtype))
 	{
-		entity deathent = deathtypes[(deathtype - DT_FIRST)];
+		entity deathent = Deathtypes[deathtype - DT_FIRST];
 		if (!deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; }
 
 		if(murder)
@@ -261,12 +260,11 @@ float Obituary_WeaponDeath(
 	string s1, string s2, string s3,
 	float f1, float f2)
 {
-	float death_weapon = DEATH_WEAPONOF(deathtype);
-	if(death_weapon)
+	Weapon death_weapon = DEATH_WEAPONOF(deathtype);
+	if (death_weapon != WEP_Null)
 	{
 		w_deathtype = deathtype;
-		Weapon w = get_weaponinfo(death_weapon);
-		int death_message = ((murder) ? w.wr_killmessage : w.wr_suicidemessage)(w);
+		int death_message = ((murder) ? death_weapon.wr_killmessage(death_weapon) : death_weapon.wr_suicidemessage(death_weapon));
 		w_deathtype = false;
 
 		if (death_message)
@@ -336,13 +334,13 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 	{
 		if(DEATH_ISSPECIAL(deathtype))
 		{
-			if(deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
+			if(deathtype == DEATH_TEAMCHANGE.m_id || deathtype == DEATH_AUTOTEAMCHANGE.m_id)
 			{
 				Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.team, 0, 0);
 			}
 			else
 			{
-				switch(deathtype)
+				switch(DEATH_ENT(deathtype))
 				{
 					case DEATH_MIRRORDAMAGE:
 					{
@@ -473,7 +471,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 			}
 
 			float f3 = 0;
-			if(deathtype == DEATH_BUFF)
+			if(deathtype == DEATH_BUFF.m_id)
 				f3 = attacker.buffs;
 
 			if (!Obituary_WeaponDeath(targ, true, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker))
@@ -486,7 +484,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 	// =============
 	else
 	{
-		switch(deathtype)
+		switch(DEATH_ENT(deathtype))
 		{
 			// For now, we're just forcing HURTTRIGGER to behave as "DEATH_VOID" and giving it no special options...
 			// Later on you will only be able to make custom messages using DEATH_CUSTOM,
@@ -561,6 +559,7 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo
 	targ.revive_progress = ((frozen_type == 3) ? 1 : 0);
 	targ.health = ((frozen_type == 3) ? targ_maxhealth : 1);
 	targ.revive_speed = freeze_time;
+	self.bot_attack = false;
 
 	entity ice, head;
 	ice = spawn();
@@ -592,6 +591,9 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo
 
 void Unfreeze (entity targ)
 {
+	if(!targ.frozen)
+		return;
+
 	if(targ.frozen && targ.frozen != 3) // only reset health if target was frozen
 		targ.health = ((IS_PLAYER(targ)) ? start_health : targ.max_health);
 
@@ -599,6 +601,7 @@ void Unfreeze (entity targ)
 	targ.frozen = 0;
 	targ.revive_progress = 0;
 	targ.revival_time = time;
+	self.bot_attack = true;
 
 	WaypointSprite_Kill(targ.waypointsprite_attached);
 
@@ -637,7 +640,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 					RemoveGrapplingHook(targ); // STOP THAT, you parasite!
 
 	// special rule: gravity bomb does not hit team mates (other than for disconnecting the hook)
-	if(DEATH_ISWEAPON(deathtype, WEP_HOOK.m_id) || DEATH_ISWEAPON(deathtype, WEP_TUBA.m_id))
+	if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA))
 	{
 		if(IS_PLAYER(targ))
 			if(SAME_TEAM(targ, attacker))
@@ -647,7 +650,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 			}
 	}
 
-	if(deathtype == DEATH_KILL || deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
+	if(deathtype == DEATH_KILL.m_id || deathtype == DEATH_TEAMCHANGE.m_id || deathtype == DEATH_AUTOTEAMCHANGE.m_id)
 	{
 		// exit the vehicle before killing (fixes a crash)
 		if(IS_PLAYER(targ) && targ.vehicle)
@@ -662,14 +665,14 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 		targ.flags -= targ.flags & FL_GODMODE;
 		damage = 100000;
 	}
-	else if(deathtype == DEATH_MIRRORDAMAGE || deathtype == DEATH_NOAMMO)
+	else if(deathtype == DEATH_MIRRORDAMAGE.m_id || deathtype == DEATH_NOAMMO.m_id)
 	{
 		// no processing
 	}
 	else
 	{
 		// nullify damage if teamplay is on
-		if(deathtype != DEATH_TELEFRAG)
+		if(deathtype != DEATH_TELEFRAG.m_id)
 		if(IS_PLAYER(attacker))
 		{
 			if(IS_PLAYER(targ) && targ != attacker && (IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(targ)))
@@ -741,10 +744,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 		force = frag_force;
 
 		if(targ.frozen)
-		if(deathtype != DEATH_HURTTRIGGER && deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_AUTOTEAMCHANGE)
+		if(deathtype != DEATH_HURTTRIGGER.m_id && deathtype != DEATH_TEAMCHANGE.m_id && deathtype != DEATH_AUTOTEAMCHANGE.m_id)
 		{
 			if(autocvar_g_freezetag_revive_falldamage > 0)
-			if(deathtype == DEATH_FALL)
+			if(deathtype == DEATH_FALL.m_id)
 			if(damage >= autocvar_g_freezetag_revive_falldamage)
 			{
 				Unfreeze(targ);
@@ -758,7 +761,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 			force *= autocvar_g_freezetag_frozen_force;
 		}
 
-		if(targ.frozen && deathtype == DEATH_HURTTRIGGER && !autocvar_g_freezetag_frozen_damage_trigger)
+		if(targ.frozen && deathtype == DEATH_HURTTRIGGER.m_id && !autocvar_g_freezetag_frozen_damage_trigger)
 		{
 			Send_Effect(EFFECT_TELEPORT, targ.origin, '0 0 0', 1);
 
@@ -823,7 +826,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 		// count the damage
 		if(attacker)
 		if(!targ.deadflag)
-		if(deathtype != DEATH_BUFF)
+		if(deathtype != DEATH_BUFF.m_id)
 		if(targ.takedamage == DAMAGE_AIM)
 		if(targ != attacker)
 		{
@@ -839,7 +842,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 				{
 					if(damage > 0)
 					{
-						if(deathtype != DEATH_FIRE)
+						if(deathtype != DEATH_FIRE.m_id)
 						{
 							if(victim.BUTTON_CHAT)
 								attacker.typehitsound += 1;
@@ -860,7 +863,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 				}
 				else
 				{
-					if(deathtype != DEATH_FIRE)
+					if(deathtype != DEATH_FIRE.m_id)
 					{
 						attacker.typehitsound += 1;
 					}
@@ -917,7 +920,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 		attacker = attacker_save;
 
 		force = normalize(attacker.origin + attacker.view_ofs - hitloc) * mirrorforce;
-		Damage(attacker, inflictor, attacker, mirrordamage, DEATH_MIRRORDAMAGE, attacker.origin, force);
+		Damage(attacker, inflictor, attacker, mirrordamage, DEATH_MIRRORDAMAGE.m_id, attacker.origin, force);
 	}
 }
 
@@ -947,7 +950,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in
 	total_damage_to_creatures = 0;
 
 	if(deathtype != (WEP_HOOK.m_id | HITTYPE_SECONDARY | HITTYPE_BOUNCE)) // only send gravity bomb damage once
-		if(DEATH_WEAPONOF(deathtype) != WEP_TUBA.m_id) // do not send tuba damage (bandwidth hog)
+		if(DEATH_WEAPONOF(deathtype) != WEP_TUBA) // do not send tuba damage (bandwidth hog)
 		{
 			force = inflictorvelocity;
 			if(vlen(force) == 0)
@@ -1105,7 +1108,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in
 	RadiusDamage_running = 0;
 
 	if(!DEATH_ISSPECIAL(deathtype))
-		accuracy_add(attacker, DEATH_WEAPONOF(deathtype), 0, min(coredamage, stat_damagedone));
+		accuracy_add(attacker, DEATH_WEAPONOF(deathtype).m_id, 0, min(coredamage, stat_damagedone));
 
 	return total_damage_to_creatures;
 }
@@ -1221,7 +1224,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt)
 				}
 			}
 			if(accuracy_isgooddamage(o, e))
-				accuracy_add(o, DEATH_WEAPONOF(dt), 0, max(0, totaldamage - mindamage));
+				accuracy_add(o, DEATH_WEAPONOF(dt).m_id, 0, max(0, totaldamage - mindamage));
 			return max(0, totaldamage - mindamage); // can never be negative, but to make sure
 		}
 		else
@@ -1235,7 +1238,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt)
 		e.fire_owner = o;
 		e.fire_hitsound = false;
 		if(accuracy_isgooddamage(o, e))
-			accuracy_add(o, DEATH_WEAPONOF(dt), 0, d);
+			accuracy_add(o, DEATH_WEAPONOF(dt).m_id, 0, d);
 		return d;
 	}
 }
@@ -1285,7 +1288,7 @@ void Fire_ApplyDamage(entity e)
 		{
 			t = autocvar_g_balance_firetransfer_time * (e.fire_endtime - time);
 			d = autocvar_g_balance_firetransfer_damage * e.fire_damagepersec * t;
-			Fire_AddDamage(other, o, d, t, DEATH_FIRE);
+			Fire_AddDamage(other, o, d, t, DEATH_FIRE.m_id);
 		}
 	}
 }