Merge branch 'master' into TimePath/experiments/csqc_prediction

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

diff --git a/qcsrc/server/mutators/gamemode_race.qc b/qcsrc/server/mutators/gamemode_race.qc
index 3bb705c07db0e9d7b2f516a34574536ff807a4c6..7ba8328469765b40513ba9160aceb139b2bf3873 100644 (file)
--- a/qcsrc/server/mutators/gamemode_race.qc
+++ b/qcsrc/server/mutators/gamemode_race.qc
@@ -29,7 +29,7 @@ void havocbot_role_race()
 
 void race_ScoreRules()
 {
-       ScoreRules_basics(race_teams, 0, 0, FALSE);
+       ScoreRules_basics(race_teams, 0, 0, false);
        if(race_teams)
        {
                ScoreInfo_SetLabel_TeamScore(  ST_RACE_LAPS,    "laps",      SFL_SORT_PRIO_PRIMARY);
@@ -50,6 +50,12 @@ void race_ScoreRules()
        ScoreRules_basics_end();
 }
 
+void race_EventLog(string mode, entity actor) // use an alias for easy changing and quick editing later
+{
+       if(autocvar_sv_eventlog)
+               GameLogEcho(strcat(":race:", mode, ":", ((actor != world) ? (strcat(":", ftos(actor.playerid))) : "")));
+}
+
 MUTATOR_HOOKFUNCTION(race_PlayerPhysics)
 {
        // force kbd movement for fairness
@@ -60,26 +66,26 @@ MUTATOR_HOOKFUNCTION(race_PlayerPhysics)
        // ensure nothing EVIL is being done (i.e. div0_evade)
        // this hinders joystick users though
        // but it still gives SOME analog control
-       wishvel_x = fabs(self.movement_x);
-       wishvel_y = fabs(self.movement_y);
-       if(wishvel_x != 0 && wishvel_y != 0 && wishvel_x != wishvel_y)
+       wishvel.x = fabs(self.movement.x);
+       wishvel.y = fabs(self.movement.y);
+       if(wishvel.x != 0 && wishvel.y != 0 && wishvel.x != wishvel.y)
        {
-               wishvel_z = 0;
+               wishvel.z = 0;
                wishspeed = vlen(wishvel);
-               if(wishvel_x >= 2 * wishvel_y)
+               if(wishvel.x >= 2 * wishvel.y)
                {
                        // pure X motion
-                       if(self.movement_x > 0)
+                       if(self.movement.x > 0)
                                self.movement_x = wishspeed;
                        else
                                self.movement_x = -wishspeed;
                        self.movement_y = 0;
                }
-               else if(wishvel_y >= 2 * wishvel_x)
+               else if(wishvel.y >= 2 * wishvel.x)
                {
                        // pure Y motion
                        self.movement_x = 0;
-                       if(self.movement_y > 0)
+                       if(self.movement.y > 0)
                                self.movement_y = wishspeed;
                        else
                                self.movement_y = -wishspeed;
@@ -87,18 +93,18 @@ MUTATOR_HOOKFUNCTION(race_PlayerPhysics)
                else
                {
                        // diagonal
-                       if(self.movement_x > 0)
+                       if(self.movement.x > 0)
                                self.movement_x = M_SQRT1_2 * wishspeed;
                        else
                                self.movement_x = -M_SQRT1_2 * wishspeed;
-                       if(self.movement_y > 0)
+                       if(self.movement.y > 0)
                                self.movement_y = M_SQRT1_2 * wishspeed;
                        else
                                self.movement_y = -M_SQRT1_2 * wishspeed;
                }
        }
-       
-       return FALSE;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_ResetMap)
@@ -119,7 +125,7 @@ MUTATOR_HOOKFUNCTION(race_ResetMap)
                        if(!s)
                                e.race_place = 0;
                }
-               print(e.netname, " = ", ftos(e.race_place), "\n");
+               race_EventLog(ftos(e.race_place), e);
        }
 
        if(g_race_qualifying == 2)
@@ -131,8 +137,8 @@ MUTATOR_HOOKFUNCTION(race_ResetMap)
                cvar_set("timelimit", ftos(race_timelimit));
                race_ScoreRules();
        }
-       
-       return FALSE;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_PlayerPreThink)
@@ -142,7 +148,7 @@ MUTATOR_HOOKFUNCTION(race_PlayerPreThink)
        if(msg_entity.enemy.race_laptime)
                race_SendNextCheckpoint(msg_entity.enemy, 1);
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_ClientConnect)
@@ -152,21 +158,24 @@ MUTATOR_HOOKFUNCTION(race_ClientConnect)
 
        string rr = RACE_RECORD;
 
-       msg_entity = self;
-       race_send_recordtime(MSG_ONE);
-       race_send_speedaward(MSG_ONE);
+       if(IS_REAL_CLIENT(self))
+       {
+               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;
-       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;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_MakePlayerObserver)
@@ -180,7 +189,7 @@ MUTATOR_HOOKFUNCTION(race_MakePlayerObserver)
        race_PreparePlayer();
        self.race_checkpoint = -1;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_PlayerSpawn)
@@ -194,8 +203,8 @@ MUTATOR_HOOKFUNCTION(race_PlayerSpawn)
        self.race_respawn_spotref = spawn_spot;
 
        self.race_place = 0;
-       
-       return FALSE;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_PutClientInServer)
@@ -210,20 +219,20 @@ MUTATOR_HOOKFUNCTION(race_PutClientInServer)
 
                race_AbandonRaceCheck(self);
        }
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_PlayerDies)
 {
        self.respawn_flags |= RESPAWN_FORCE;
        race_AbandonRaceCheck(self);
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_BotRoles)
 {
        self.havocbot_role = havocbot_role_race;
-       return TRUE;
+       return true;
 }
 
 MUTATOR_HOOKFUNCTION(race_PlayerPostThink)
@@ -240,26 +249,28 @@ MUTATOR_HOOKFUNCTION(race_PlayerPostThink)
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_ForbidClearPlayerScore)
 {
        if(g_race_qualifying)
-               return TRUE; // in qualifying, you don't lose score by observing
+               return true; // in qualifying, you don't lose score by observing
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_GetTeamCount)
 {
        ret_float = race_teams;
-       return FALSE;
+       return false;
 }
 
 void race_Initialize()
 {
        race_ScoreRules();
+       if(g_race_qualifying == 2)
+               warmup_stage = 0;
 }
 
 MUTATOR_DEFINITION(gamemode_race)
@@ -272,7 +283,7 @@ MUTATOR_DEFINITION(gamemode_race)
        MUTATOR_HOOK(PlayerSpawn, race_PlayerSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(PutClientInServer, race_PutClientInServer, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDies, race_PlayerDies, CBC_ORDER_ANY);
-       MUTATOR_HOOK(HavocBot_ChooseRule, race_BotRoles, CBC_ORDER_ANY);
+       MUTATOR_HOOK(HavocBot_ChooseRole, race_BotRoles, CBC_ORDER_ANY);
        MUTATOR_HOOK(GetPressedKeys, race_PlayerPostThink, CBC_ORDER_ANY);
        MUTATOR_HOOK(ForbidPlayerScore_Clear, race_ForbidClearPlayerScore, CBC_ORDER_ANY);
        MUTATOR_HOOK(GetTeamCount, race_GetTeamCount, CBC_ORDER_ANY);