Merge remote-tracking branch 'origin/mrbougo/killspree_bugfix'
authorJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 18:17:15 +0000 (20:17 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 18:17:15 +0000 (20:17 +0200)
qcsrc/server/g_damage.qc

index d77d614759e00944a15474e8bd4097785f39bbf4..7b02f4e5ecdc9a2fe0446c49782089aa4b89dd43 100644 (file)
@@ -458,10 +458,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 
                                attacker.killcount = attacker.killcount + 1;
 
-                               if (attacker.killcount > 2) {
-                                       Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
-                               }
-                               else if (attacker.killcount == 3)
+                               if (attacker.killcount == 3)
                                {
                                        Send_KillNotification(a, "", "", KILL_SPREE_3, MSG_SPREE);
                                        AnnounceTo(attacker, "03kills");
@@ -503,6 +500,9 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        AnnounceTo(attacker, "30kills");
                                        PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_30, 1);
                                }
+                               else if (attacker.killcount > 2) {
+                                       Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
+                               }
                                LogDeath("frag", deathtype, attacker, targ);
                        }
                }