X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=fb179a37679b61679d570bb2cfcc285e55cf6ed6;hb=15a449780e666b73d76cef39230b15ade1daf45f;hp=8bc7e34111aa1f9fa7330e855d783a7e0a10323c;hpb=ee550239cdbc8b9c73025dba9c143d5271fe9292;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 8bc7e3411..fb179a376 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -120,10 +120,6 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype) PlayerScore_Add(targ, SP_DEATHS, 1); - if(g_arena || g_ca) - if(autocvar_g_arena_roundbased) - return; - if(targ != attacker) // not for suicides if(g_weaponarena_random) { @@ -456,7 +452,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) #define SPREE_ITEM(counta,countb,center,normal,gentle) \ case counta: \ { \ - Send_Notification(NOTIF_ONE, attacker, MSG_ANNCE, ANNCE_KILLSTREAK_##counta); \ + Send_Notification(NOTIF_ONE, attacker, MSG_ANNCE, ANNCE_KILLSTREAK_##countb); \ PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_##counta, 1); \ break; \ }