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 fd48a0fce806563e225102cc364b0ff8f39c1f1a..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);
@@ -66,11 +66,11 @@ 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);
+       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)
                {
@@ -103,8 +103,8 @@ MUTATOR_HOOKFUNCTION(race_PlayerPhysics)
                                self.movement_y = -M_SQRT1_2 * wishspeed;
                }
        }
-       
-       return FALSE;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_ResetMap)
@@ -137,8 +137,8 @@ MUTATOR_HOOKFUNCTION(race_ResetMap)
                cvar_set("timelimit", ftos(race_timelimit));
                race_ScoreRules();
        }
-       
-       return FALSE;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_PlayerPreThink)
@@ -148,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)
@@ -175,7 +175,7 @@ MUTATOR_HOOKFUNCTION(race_ClientConnect)
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_MakePlayerObserver)
@@ -189,7 +189,7 @@ MUTATOR_HOOKFUNCTION(race_MakePlayerObserver)
        race_PreparePlayer();
        self.race_checkpoint = -1;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(race_PlayerSpawn)
@@ -203,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)
@@ -219,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)
@@ -249,21 +249,21 @@ 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()