Merge branch 'master' into TimePath/deathtypes

[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 9c674d45d89933fa9f24e8bc13e31e7f2a7995d4..06e2ca3fa571ae6f6ec91694740f9a0c5a1b2ecf 100644 (file)
--- a/qcsrc/server/mutators/gamemode_cts.qc
+++ b/qcsrc/server/mutators/gamemode_cts.qc
@@ -1,7 +1,13 @@
+#include "gamemode_cts.qh"
+
+#include "gamemode.qh"
+
+#include "../race.qh"
+
 // legacy bot roles
 .float race_checkpoint;
 void havocbot_role_cts()
-{
+{SELFPARAM();
        if(self.deadflag != DEAD_NO)
                return;
 
@@ -29,7 +35,7 @@ void havocbot_role_cts()
 
 void cts_ScoreRules()
 {
-       ScoreRules_basics(0, 0, 0, FALSE);
+       ScoreRules_basics(0, 0, 0, false);
        if(g_race_qualifying)
        {
                ScoreInfo_SetLabel_PlayerScore(SP_CTS_FASTEST, "fastest",   SFL_SORT_PRIO_PRIMARY | SFL_LOWER_IS_BETTER | SFL_TIME);
@@ -50,7 +56,7 @@ void cts_EventLog(string mode, entity actor) // use an alias for easy changing a
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerPhysics)
-{
+{SELFPARAM();
        // force kbd movement for fairness
        float wishspeed;
        vector wishvel;
@@ -59,26 +65,26 @@ MUTATOR_HOOKFUNCTION(cts_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;
@@ -86,18 +92,18 @@ MUTATOR_HOOKFUNCTION(cts_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(cts_ResetMap)
@@ -130,25 +136,25 @@ MUTATOR_HOOKFUNCTION(cts_ResetMap)
                cvar_set("timelimit", ftos(race_timelimit));
                cts_ScoreRules();
        }
-       
-       return FALSE;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerPreThink)
-{
+{SELFPARAM();
        if(IS_SPEC(self) || IS_OBSERVER(self))
        if(g_race_qualifying)
        if(msg_entity.enemy.race_laptime)
                race_SendNextCheckpoint(msg_entity.enemy, 1);
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_ClientConnect)
-{
+{SELFPARAM();
        race_PreparePlayer();
        self.race_checkpoint = -1;
-       
+
        if(IS_REAL_CLIENT(self))
        {
                string rr = CTS_RECORD;
@@ -168,11 +174,11 @@ MUTATOR_HOOKFUNCTION(cts_ClientConnect)
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_MakePlayerObserver)
-{
+{SELFPARAM();
        if(PlayerScore_Add(self, SP_RACE_FASTEST, 0))
                self.frags = FRAGS_LMS_LOSER;
        else
@@ -181,11 +187,11 @@ MUTATOR_HOOKFUNCTION(cts_MakePlayerObserver)
        race_PreparePlayer();
        self.race_checkpoint = -1;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerSpawn)
-{
+{SELFPARAM();
        if(spawn_spot.target == "")
                // Emergency: this wasn't a real spawnpoint. Can this ever happen?
                race_PreparePlayer();
@@ -195,12 +201,12 @@ MUTATOR_HOOKFUNCTION(cts_PlayerSpawn)
        self.race_respawn_spotref = spawn_spot;
 
        self.race_place = 0;
-       
-       return FALSE;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PutClientInServer)
-{
+{SELFPARAM();
        if(IS_PLAYER(self))
        if(!gameover)
        {
@@ -211,24 +217,24 @@ MUTATOR_HOOKFUNCTION(cts_PutClientInServer)
 
                race_AbandonRaceCheck(self);
        }
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerDies)
-{
+{SELFPARAM();
        self.respawn_flags |= RESPAWN_FORCE;
        race_AbandonRaceCheck(self);
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_BotRoles)
-{
+{SELFPARAM();
        self.havocbot_role = havocbot_role_cts;
-       return TRUE;
+       return true;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerPostThink)
-{
+{SELFPARAM();
        if(self.cvar_cl_allow_uidtracking == 1 && self.cvar_cl_allow_uid2name == 1)
        {
                if (!self.stored_netname)
@@ -241,42 +247,42 @@ MUTATOR_HOOKFUNCTION(cts_PlayerPostThink)
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_ForbidThrowing)
 {
        // no weapon dropping in CTS
-       return TRUE;
+       return true;
 }
 
 MUTATOR_HOOKFUNCTION(cts_FilterItem)
-{
+{SELFPARAM();
        if(self.classname == "droppedweapon")
-               return TRUE;
+               return true;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerDamage)
 {
-       if(frag_target == frag_attacker || frag_deathtype == DEATH_FALL)
+       if(frag_target == frag_attacker || frag_deathtype == DEATH_FALL.m_id)
        if(!autocvar_g_cts_selfdamage)
                frag_damage = 0;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_ForbidClearPlayerScore)
 {
-       return TRUE; // in CTS, you don't lose score by observing
+       return true; // in CTS, you don't lose score by observing
 }
 
 MUTATOR_HOOKFUNCTION(cts_SetMods)
 {
        g_cloaked = 1; // always enable cloak in CTS
 
-       return FALSE;
+       return false;
 }
 
 void cts_Initialize()
@@ -318,7 +324,7 @@ MUTATOR_DEFINITION(gamemode_cts)
 
        MUTATOR_ONREMOVE
        {
-               print("This is a game type and it cannot be removed at runtime.");
+               LOG_INFO("This is a game type and it cannot be removed at runtime.");
                return -1;
        }