X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=45962bee7b3e69cb94513c8b57eccb36ba225446;hb=8db1ea65ccbb6a2e6232359f51de5e5b35297659;hp=30e49cd56f7d782b11c0721fee96bde7bba0396b;hpb=1b9fb2415152cf5a365cfaf9cf234372aaba6852;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 30e49cd56..45962bee7 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -257,20 +257,21 @@ void Send_KillNotification (string s1, string s2, string s3, float msg, float ty
 	WriteByte(MSG_ALL, type);
 }
 
-// TODO: writespectatable?
 // Function is used to send a generic centerprint whose content CSQC gets to decide (gentle version or not in the below cases)
 void Send_CSQC_Centerprint(entity e, string s1, string s2, float msg, float type)
 {
 	if (clienttype(e) == CLIENTTYPE_REAL)
 	{
 		msg_entity = e;
-		WriteByte(MSG_ONE, SVC_TEMPENTITY);
-		WriteByte(MSG_ONE, TE_CSQC_NOTIFY);
-		WriteByte(MSG_ONE, CSQC_CENTERPRINT);
-		WriteString(MSG_ONE, s1);
-		WriteString(MSG_ONE, s2);
-		WriteShort(MSG_ONE, msg);
-		WriteByte(MSG_ONE, type);
+		WRITESPECTATABLE_MSG_ONE({
+			WriteByte(MSG_ONE, SVC_TEMPENTITY);
+			WriteByte(MSG_ONE, TE_CSQC_NOTIFY);
+			WriteByte(MSG_ONE, CSQC_CENTERPRINT);
+			WriteString(MSG_ONE, s1);
+			WriteString(MSG_ONE, s2);
+			WriteShort(MSG_ONE, msg);
+			WriteByte(MSG_ONE, type);
+		});
 	}
 }
 
@@ -294,19 +295,6 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 				msg = ColoredTeamName(targ.team); // TODO: check if needed?
 			Send_CSQC_Centerprint(targ, msg, "", deathtype, MSG_SUICIDE);
 
-			if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
-			{
-				LogDeath("suicide", deathtype, targ, targ);
-				GiveFrags(attacker, targ, -1);
-			}
-			// TODO: hmm?
-			/*
-				if (targ.killcount > 2)
-					bprint ("^1",s,"^1 faded after a ",ftos(targ.killcount)," point spree\n");
-			*/
-
-			// TODO: wut is this?
-			// givefrags for logging apparently?
 			if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
 			{
 				LogDeath("suicide", deathtype, targ, targ);
@@ -315,7 +303,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 
 			if (targ.killcount > 2)
 				msg = ftos(targ.killcount);
-			if(teams_matter && attacker.team == targ.team)
+			if(teams_matter && deathtype == DEATH_MIRRORDAMAGE)
 			{
 				if(attacker.team == COLOR_TEAM1)
 					deathtype = KILL_TEAM_RED;
@@ -359,7 +347,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 				{
 					checkrules_firstblood = TRUE;
 					Send_KillNotification(a, "", "", KILL_FIRST_BLOOD, MSG_KILL);
-					// TODO: make these print at newline if they dont
+					// TODO: make these print a newline if they dont
 					Send_CSQC_Centerprint(attacker, "", "", KILL_FIRST_BLOOD, MSG_KILL);
 					Send_CSQC_Centerprint(targ, "", "", KILL_FIRST_VICTIM, MSG_KILL);
 				}
@@ -375,13 +363,14 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 				attacker.taunt_soundtime = time + 1;
 
 				// TODO: fix this?
-					if (deathtype == DEATH_CUSTOM)
-						msg = strcat(deathmessage, " by ^1", msg);
-					else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
-					{
-						msg = ftos(strstrofs(inflictor.message2, "#", 0));
-					}
-					Send_KillNotification(s, a, msg, deathtype, MSG_KILL);
+				if (deathtype == DEATH_CUSTOM)
+					msg = strcat(deathmessage, " by ^1", msg);
+				else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
+				{
+					msg = ftos(strstrofs(inflictor.message2, "#", 0));
+				}
+
+				Send_KillNotification(a, s, msg, deathtype, MSG_KILL);
 
 				if(g_ctf && targ.flagcarried)
 				{
@@ -401,10 +390,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 				if (attacker.killcount > 2) {
 					Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
 				}
-
-				LogDeath("frag", deathtype, attacker, targ);
-
-				if (attacker.killcount == 3)
+				else if (attacker.killcount == 3)
 				{
 					Send_KillNotification(a, "", "", KILL_SPREE_3, MSG_SPREE);
 					AnnounceTo(attacker, "03kills");
@@ -439,6 +425,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 					Send_KillNotification(a, "", "", KILL_SPREE_30, MSG_SPREE);
 					AnnounceTo(attacker, "30kills");
 				}
+				LogDeath("frag", deathtype, attacker, targ);
 			}
 		}
 		else
@@ -475,6 +462,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 entity damage_targ;
 entity damage_inflictor;
 entity damage_attacker;
+.float prevhitsound;
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
@@ -737,10 +725,14 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 				{
 					if(damage > 0)
 					{
-						if(targ.BUTTON_CHAT)
-							attacker.typehitsound += 1;
-						else
-							attacker.hitsound += 1;
+						if(attacker.weapon != WEP_ELECTRO && attacker.weapon != WEP_LASER || ((attacker.weapon == WEP_ELECTRO && cvar("g_balance_electro_lightning") || attacker.weapon == WEP_LASER) && attacker.prevhitsound + cvar("sv_hitsound_antispam_time") < time))
+						{
+							if(targ.BUTTON_CHAT)
+								attacker.typehitsound += 1;
+							else
+								attacker.hitsound += 1;
+							attacker.prevhitsound = time;
+						}
 
 						damage_goodhits += 1;
 						damage_gooddamage += damage;