Merge remote branch 'origin/samual/hitindication'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 14 Feb 2011 17:46:06 +0000 (18:46 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 14 Feb 2011 17:46:06 +0000 (18:46 +0100)
1  2 
qcsrc/server/g_damage.qc

diff --combined qcsrc/server/g_damage.qc
@@@ -789,14 -789,16 +789,15 @@@ void Damage (entity targ, entity inflic
                                {
                                        if(damage > 0)
                                        {
 -                                              if(attacker.weapon != WEP_LASER
 -                                              && (attacker.weapon != WEP_ELECTRO || !autocvar_g_balance_electro_lightning)
 -                                              && attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time)
 +                                              if(deathtype != DEATH_FIRE)
 +                                              if(attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time)
                                                {
                                                        if(targ.BUTTON_CHAT)
                                                                attacker.typehitsound += 1;
                                                        else
                                                                attacker.hitsound += 1;
                                                        attacker.prevhitsound = time;
+                                                       attacker.hit_time = time;
                                                }
  
                                                damage_goodhits += 1;
                                }
                                else
                                {
 -                                      if(deathtype != DEATH_FIRE
 -                                      && attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time)
 +                                      if(deathtype != DEATH_FIRE)
 +                                      if(attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time)
                                        {
                                                attacker.typehitsound += 1;
                                                attacker.prevhitsound = time;