Merge branch 'master' into Mario/race_cts_mutators

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_cts.qc

diff --git a/qcsrc/server/mutators/gamemode_cts.qc b/qcsrc/server/mutators/gamemode_cts.qc
index 6bbd70dabfa9d6fd6bc8ce81e6a59146cab8ddda..ef4d53dad061c34511c4e8fc58e0715b755aa26a 100644 (file)
--- a/qcsrc/server/mutators/gamemode_cts.qc
+++ b/qcsrc/server/mutators/gamemode_cts.qc
@@ -143,21 +143,23 @@ MUTATOR_HOOKFUNCTION(cts_ClientConnect)
        race_PreparePlayer();
        self.race_checkpoint = -1;
        
-       string rr = CTS_RECORD;
+       if(IS_REAL_CLIENT(self))
+       {
+               string rr = CTS_RECORD;
 
-       msg_entity = self;
-       race_send_recordtime(MSG_ONE);
-       race_send_speedaward(MSG_ONE);
+               msg_entity = self;
+               race_send_recordtime(MSG_ONE);
+               race_send_speedaward(MSG_ONE);
 
-       speedaward_alltimebest = stof(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/speed")));
-       speedaward_alltimebest_holder = uid2name(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/crypto_idfp")));
-       race_send_speedaward_alltimebest(MSG_ONE);
+               speedaward_alltimebest = stof(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/speed")));
+               speedaward_alltimebest_holder = uid2name(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/crypto_idfp")));
+               race_send_speedaward_alltimebest(MSG_ONE);
 
-       float i;
-       if(IS_REAL_CLIENT(self))
-       for (i = 1; i <= RANKINGS_CNT; ++i)
-       {
-               race_SendRankings(i, 0, 0, MSG_ONE);
+               float i;
+               for (i = 1; i <= RANKINGS_CNT; ++i)
+               {
+                       race_SendRankings(i, 0, 0, MSG_ONE);
+               }
        }
 
        return FALSE;
@@ -281,7 +283,7 @@ MUTATOR_DEFINITION(gamemode_cts)
        MUTATOR_HOOK(PlayerSpawn, cts_PlayerSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(PutClientInServer, cts_PutClientInServer, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDies, cts_PlayerDies, CBC_ORDER_ANY);
-       MUTATOR_HOOK(HavocBot_ChooseRule, cts_BotRoles, CBC_ORDER_ANY);
+       MUTATOR_HOOK(HavocBot_ChooseRole, cts_BotRoles, CBC_ORDER_ANY);
        MUTATOR_HOOK(GetPressedKeys, cts_PlayerPostThink, CBC_ORDER_ANY);
        MUTATOR_HOOK(ForbidThrowCurrentWeapon, cts_ForbidThrowing, CBC_ORDER_ANY);
        MUTATOR_HOOK(FilterItem, cts_FilterItem, CBC_ORDER_ANY);