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 0886a9ce59921cf205bc71dba4a89bc9897b3846..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;
 
@@ -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;
@@ -135,7 +141,7 @@ MUTATOR_HOOKFUNCTION(cts_ResetMap)
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerPreThink)
-{
+{SELFPARAM();
        if(IS_SPEC(self) || IS_OBSERVER(self))
        if(g_race_qualifying)
        if(msg_entity.enemy.race_laptime)
@@ -145,7 +151,7 @@ MUTATOR_HOOKFUNCTION(cts_PlayerPreThink)
 }
 
 MUTATOR_HOOKFUNCTION(cts_ClientConnect)
-{
+{SELFPARAM();
        race_PreparePlayer();
        self.race_checkpoint = -1;
 
@@ -172,7 +178,7 @@ MUTATOR_HOOKFUNCTION(cts_ClientConnect)
 }
 
 MUTATOR_HOOKFUNCTION(cts_MakePlayerObserver)
-{
+{SELFPARAM();
        if(PlayerScore_Add(self, SP_RACE_FASTEST, 0))
                self.frags = FRAGS_LMS_LOSER;
        else
@@ -185,7 +191,7 @@ MUTATOR_HOOKFUNCTION(cts_MakePlayerObserver)
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerSpawn)
-{
+{SELFPARAM();
        if(spawn_spot.target == "")
                // Emergency: this wasn't a real spawnpoint. Can this ever happen?
                race_PreparePlayer();
@@ -200,7 +206,7 @@ MUTATOR_HOOKFUNCTION(cts_PlayerSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(cts_PutClientInServer)
-{
+{SELFPARAM();
        if(IS_PLAYER(self))
        if(!gameover)
        {
@@ -215,20 +221,20 @@ MUTATOR_HOOKFUNCTION(cts_PutClientInServer)
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerDies)
-{
+{SELFPARAM();
        self.respawn_flags |= RESPAWN_FORCE;
        race_AbandonRaceCheck(self);
        return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_BotRoles)
-{
+{SELFPARAM();
        self.havocbot_role = havocbot_role_cts;
        return true;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerPostThink)
-{
+{SELFPARAM();
        if(self.cvar_cl_allow_uidtracking == 1 && self.cvar_cl_allow_uid2name == 1)
        {
                if (!self.stored_netname)
@@ -251,7 +257,7 @@ MUTATOR_HOOKFUNCTION(cts_ForbidThrowing)
 }
 
 MUTATOR_HOOKFUNCTION(cts_FilterItem)
-{
+{SELFPARAM();
        if(self.classname == "droppedweapon")
                return true;
 
@@ -260,7 +266,7 @@ MUTATOR_HOOKFUNCTION(cts_FilterItem)
 
 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;
 
@@ -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;
        }