]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Don't check for firstblood if in warmup
authorFreddy <schro.sb@gmail.com>
Tue, 24 Oct 2017 13:47:12 +0000 (15:47 +0200)
committerFreddy <schro.sb@gmail.com>
Tue, 24 Oct 2017 13:47:12 +0000 (15:47 +0200)
qcsrc/server/g_damage.qc

index 108297d4a5eccd846c2a54051bee5c780256e6c4..afe018c08bc0198c2240c99e44f7dea7e75295fd 100644 (file)
@@ -379,15 +379,12 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
                        }
                        #undef SPREE_ITEM
 
-                       if(!checkrules_firstblood)
+                       if(!warmup_stage && !checkrules_firstblood)
                        {
                                checkrules_firstblood = true;
                                notif_firstblood = true; // modify the current messages so that they too show firstblood information
-                               if (!warmup_stage)
-                               {
-                                       PlayerStats_GameReport_Event_Player(attacker, PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD, 1);
-                                       PlayerStats_GameReport_Event_Player(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1);
-                               }
+                               PlayerStats_GameReport_Event_Player(attacker, PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD, 1);
+                               PlayerStats_GameReport_Event_Player(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1);
 
                                // tell spree_inf and spree_cen that this is a first-blood and first-victim event
                                kill_count_to_attacker = -1;