X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=5ed980b2306b968d0a17f5226cc80186f1a7474c;hp=e11a6d428fb9cda2031061b86a48a927ccf55443;hb=b46fdcee5c729ccdf485d908803d06bbfdac2a8c;hpb=5ac3c3d06950a44119698d6ab95464e95f78cf40;ds=sidebyside

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index e11a6d428f..5ed980b230 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -475,6 +475,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 +738,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;