X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_race.qc;h=2f581d8c433af0c6b8047e71ab7571825eb7ceba;hb=f89756fe67d432c4bdb4b1c2c663b63502ac0533;hp=2dae1012a1efbce26ad778788f59891a0187229f;hpb=f570e338e4f861aa53cd44a4014a077105cefe72;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qc b/qcsrc/server/mutators/mutator/gamemode_race.qc index 2dae1012a..2f581d8c4 100644 --- a/qcsrc/server/mutators/mutator/gamemode_race.qc +++ b/qcsrc/server/mutators/mutator/gamemode_race.qc @@ -197,7 +197,7 @@ MUTATOR_HOOKFUNCTION(rc, reset_map_global) FOREACH_CLIENT(true, { if(it.race_place) { - s = PlayerScore_Add(it, SP_RACE_FASTEST, 0); + s = GameRules_scoring_add(it, RACE_FASTEST, 0); if(!s) it.race_place = 0; } @@ -247,7 +247,7 @@ MUTATOR_HOOKFUNCTION(rc, MakePlayerObserver) entity player = M_ARGV(0, entity); if(g_race_qualifying) - if(PlayerScore_Add(player, SP_RACE_FASTEST, 0)) + if(GameRules_scoring_add(player, RACE_FASTEST, 0)) player.frags = FRAGS_LMS_LOSER; else player.frags = FRAGS_SPECTATOR; @@ -440,14 +440,7 @@ void rc_SetLimits() if(autocvar_g_race_teams) { GameRules_teams(true); - race_teams = bound(2, autocvar_g_race_teams, 4); - int teams = 0; - if(race_teams >= 1) teams |= BIT(0); - if(race_teams >= 2) teams |= BIT(1); - if(race_teams >= 3) teams |= BIT(2); - if(race_teams >= 4) teams |= BIT(3); - - race_teams = teams; // now set it? + race_teams = BITS(bound(2, autocvar_g_race_teams, 4)); } else race_teams = 0;