Permalink
Browse files

game: always sort scoreboard when player dies, refs #478

  • Loading branch information...
1 parent 3e26c97 commit 047390d26793cd0ec9860c9fe4f1ff060ad45da4 @rmarquis rmarquis committed Feb 16, 2017
Showing with 3 additions and 4 deletions.
  1. +3 −4 src/game/g_combat.c
View
@@ -72,9 +72,6 @@ void AddKillScore(gentity_t *ent, int score)
ent->client->ps.persistant[PERS_SCORE] += score;
level.teamScores[ent->client->ps.persistant[PERS_TEAM]] += score;
-
- // prepare scoreboard
- CalculateRanks();
}
/**
@@ -604,7 +601,6 @@ void player_die(gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
{
if (g_complaintlimit.integer)
{
-
if (!(meansOfDeath == MOD_LANDMINE && (g_disableComplaints.integer & TKFL_MINES)) &&
!((meansOfDeath == MOD_ARTY || meansOfDeath == MOD_AIRSTRIKE) && (g_disableComplaints.integer & TKFL_AIRSTRIKE)) &&
!((meansOfDeath == MOD_MORTAR || meansOfDeath == MOD_MORTAR2) && (g_disableComplaints.integer & TKFL_MORTAR)))
@@ -650,6 +646,9 @@ void player_die(gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
}
}
+ // prepare scoreboard
+ CalculateRanks();
+
G_DropItems(self);
// send a fancy "MEDIC!" scream. Sissies, ain' they?

0 comments on commit 047390d

Please sign in to comment.