Merge branch 'master' into Mario/qc_updates

[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 ef4d53dad061c34511c4e8fc58e0715b755aa26a..0886a9ce59921cf205bc71dba4a89bc9897b3846 100644 (file)
--- a/qcsrc/server/mutators/gamemode_cts.qc
+++ b/qcsrc/server/mutators/gamemode_cts.qc
@@ -29,7 +29,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);
@@ -43,6 +43,12 @@ void cts_ScoreRules()
        ScoreRules_basics_end();
 }
 
+void cts_EventLog(string mode, entity actor) // use an alias for easy changing and quick editing later
+{
+       if(autocvar_sv_eventlog)
+               GameLogEcho(strcat(":cts:", mode, ":", ((actor != world) ? (strcat(":", ftos(actor.playerid))) : "")));
+}
+
 MUTATOR_HOOKFUNCTION(cts_PlayerPhysics)
 {
        // force kbd movement for fairness
@@ -53,26 +59,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;
@@ -80,18 +86,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)
@@ -112,7 +118,7 @@ MUTATOR_HOOKFUNCTION(cts_ResetMap)
                        if(!s)
                                e.race_place = 0;
                }
-               print(e.netname, " = ", ftos(e.race_place), "\n");
+               cts_EventLog(ftos(e.race_place), e);
        }
 
        if(g_race_qualifying == 2)
@@ -124,8 +130,8 @@ MUTATOR_HOOKFUNCTION(cts_ResetMap)
                cvar_set("timelimit", ftos(race_timelimit));
                cts_ScoreRules();
        }
-       
-       return FALSE;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerPreThink)
@@ -135,14 +141,14 @@ MUTATOR_HOOKFUNCTION(cts_PlayerPreThink)
        if(msg_entity.enemy.race_laptime)
                race_SendNextCheckpoint(msg_entity.enemy, 1);
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_ClientConnect)
 {
        race_PreparePlayer();
        self.race_checkpoint = -1;
-       
+
        if(IS_REAL_CLIENT(self))
        {
                string rr = CTS_RECORD;
@@ -162,7 +168,7 @@ MUTATOR_HOOKFUNCTION(cts_ClientConnect)
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_MakePlayerObserver)
@@ -175,7 +181,7 @@ MUTATOR_HOOKFUNCTION(cts_MakePlayerObserver)
        race_PreparePlayer();
        self.race_checkpoint = -1;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerSpawn)
@@ -189,8 +195,8 @@ MUTATOR_HOOKFUNCTION(cts_PlayerSpawn)
        self.race_respawn_spotref = spawn_spot;
 
        self.race_place = 0;
-       
-       return FALSE;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PutClientInServer)
@@ -205,20 +211,20 @@ MUTATOR_HOOKFUNCTION(cts_PutClientInServer)
 
                race_AbandonRaceCheck(self);
        }
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerDies)
 {
        self.respawn_flags |= RESPAWN_FORCE;
        race_AbandonRaceCheck(self);
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_BotRoles)
 {
        self.havocbot_role = havocbot_role_cts;
-       return TRUE;
+       return true;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerPostThink)
@@ -235,21 +241,21 @@ 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)
 {
        if(self.classname == "droppedweapon")
-               return TRUE;
+               return true;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(cts_PlayerDamage)
@@ -258,18 +264,23 @@ MUTATOR_HOOKFUNCTION(cts_PlayerDamage)
        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
 }
 
-void cts_Initialize()
+MUTATOR_HOOKFUNCTION(cts_SetMods)
 {
        g_cloaked = 1; // always enable cloak in CTS
 
+       return false;
+}
+
+void cts_Initialize()
+{
        cts_ScoreRules();
 }
 
@@ -289,6 +300,7 @@ MUTATOR_DEFINITION(gamemode_cts)
        MUTATOR_HOOK(FilterItem, cts_FilterItem, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDamage_Calculate, cts_PlayerDamage, CBC_ORDER_ANY);
        MUTATOR_HOOK(ForbidPlayerScore_Clear, cts_ForbidClearPlayerScore, CBC_ORDER_ANY);
+       MUTATOR_HOOK(SetModname, cts_SetMods, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {