X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=37ccf37ebd8e43247ad795c7dec27272fca96bcd;hb=a5b9bade4e12be649f913a6bebb15183feba6554;hp=00c9982c3db8c8e5d32f77da478dd399432b6803;hpb=cd3d62397dfaa03707d6b273538e8ce0157fbde9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 00c9982c3..37ccf37eb 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -14,7 +14,7 @@
 #include "weapons/selection.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
-#include "../common/notifications.qh"
+#include "../common/notifications/all.qh"
 #include "../common/physics/movetypes/movetypes.qh"
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"
@@ -125,7 +125,7 @@ string AppendItemcodes(string s, entity player)
 		s = strcat(s, "I");
 	if(player.flagcarried != world)
 		s = strcat(s, "F");
-	if(player.BUTTON_CHAT)
+	if(PHYS_INPUT_BUTTON_CHAT(player))
 		s = strcat(s, "T");
 	if(player.kh_next)
 		s = strcat(s, "K");
@@ -163,6 +163,9 @@ void Obituary_SpecialDeath(
 		entity deathent = Deathtypes_from(deathtype - DT_FIRST);
 		if (!deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; }
 
+		if(g_cts && deathtype == DEATH_KILL.m_id)
+			return; // TODO: somehow put this in CTS gamemode file!
+
 		if(murder)
 		{
 			if(deathent.death_msgmurder)
@@ -171,7 +174,7 @@ void Obituary_SpecialDeath(
 					NOTIF_ONE,
 					notif_target,
 					MSG_MULTI,
-					deathent.death_msgmurder.nent_id,
+					deathent.death_msgmurder,
 					s1, s2, s3, "",
 					f1, f2, f3, 0
 				);
@@ -179,7 +182,7 @@ void Obituary_SpecialDeath(
 					NOTIF_ALL_EXCEPT,
 					notif_target,
 					MSG_INFO,
-					deathent.death_msgmurder.nent_msginfo.nent_id,
+					deathent.death_msgmurder.nent_msginfo,
 					s1, s2, s3, "",
 					f1, f2, f3, 0
 				);
@@ -193,7 +196,7 @@ void Obituary_SpecialDeath(
 					NOTIF_ONE,
 					notif_target,
 					MSG_MULTI,
-					deathent.death_msgself.nent_id,
+					deathent.death_msgself,
 					s1, s2, s3, "",
 					f1, f2, f3, 0
 				);
@@ -201,7 +204,7 @@ void Obituary_SpecialDeath(
 					NOTIF_ALL_EXCEPT,
 					notif_target,
 					MSG_INFO,
-					deathent.death_msgself.nent_msginfo.nent_id,
+					deathent.death_msgself.nent_msginfo,
 					s1, s2, s3, "",
 					f1, f2, f3, 0
 				);
@@ -222,7 +225,7 @@ float Obituary_WeaponDeath(
 	if (death_weapon != WEP_Null)
 	{
 		w_deathtype = deathtype;
-		int death_message = ((murder) ? death_weapon.wr_killmessage(death_weapon) : death_weapon.wr_suicidemessage(death_weapon));
+		Notification death_message = ((murder) ? death_weapon.wr_killmessage(death_weapon) : death_weapon.wr_suicidemessage(death_weapon));
 		w_deathtype = false;
 
 		if (death_message)
@@ -235,11 +238,12 @@ float Obituary_WeaponDeath(
 				s1, s2, s3, "",
 				f1, f2, 0, 0
 			);
+			// send the info part to everyone
 			Send_Notification_WOCOVA(
 				NOTIF_ALL_EXCEPT,
 				notif_target,
 				MSG_INFO,
-				msg_multi_notifs[death_message - 1].nent_msginfo.nent_id,
+				death_message.nent_msginfo,
 				s1, s2, s3, "",
 				f1, f2, 0, 0
 			);
@@ -339,7 +343,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 
 			Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAG, targ.netname);
 			Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAGGED, attacker.netname);
-			Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(targ.team, INFO_DEATH_TEAMKILL_), targ.netname, attacker.netname, deathlocation, targ.killcount);
+			Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(targ.team, INFO_DEATH_TEAMKILL), targ.netname, attacker.netname, deathlocation, targ.killcount);
 
 			// In this case, the death message will ALWAYS be "foo was betrayed by bar"
 			// No need for specific death/weapon messages...
@@ -392,7 +396,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 					CHOICE_TYPEFRAG,
 					targ.netname,
 					kill_count_to_attacker,
-					(IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+					(IS_BOT_CLIENT(targ) ? -1 : targ.ping)
 				);
 				Send_Notification(
 					NOTIF_ONE,
@@ -403,7 +407,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 					kill_count_to_target,
 					attacker.health,
 					attacker.armorvalue,
-					(IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+					(IS_BOT_CLIENT(attacker) ? -1 : attacker.ping)
 				);
 			}
 			else
@@ -415,7 +419,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 					CHOICE_FRAG,
 					targ.netname,
 					kill_count_to_attacker,
-					(IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+					(IS_BOT_CLIENT(targ) ? -1 : targ.ping)
 				);
 				Send_Notification(
 					NOTIF_ONE,
@@ -426,7 +430,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 					kill_count_to_target,
 					attacker.health,
 					attacker.armorvalue,
-					(IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+					(IS_BOT_CLIENT(attacker) ? -1 : attacker.ping)
 				);
 			}
 
@@ -797,7 +801,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 					{
 						if(deathtype != DEATH_FIRE.m_id)
 						{
-							if(victim.BUTTON_CHAT)
+							if(PHYS_INPUT_BUTTON_CHAT(victim))
 								attacker.typehitsound += 1;
 							else
 								attacker.damage_dealt += damage;