Merge branch 'master' into TimePath/deathtypes

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

diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index d430f1b00748774083534ce19420b5f1abff0f16..42aa4a29e77f000832c406a49620331d9010c850 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -1,9 +1,18 @@
-float total_players;
-float redalive, bluealive, yellowalive, pinkalive;
-.float redalive_stat, bluealive_stat, yellowalive_stat, pinkalive_stat;
+#include "gamemode_ca.qh"
+
+#include "gamemode.qh"
+
 float ca_teams;
 float allowed_to_spawn;
 
+const float ST_CA_ROUNDS = 1;
+void ca_ScoreRules(float teams)
+{
+       ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, 0, true);
+       ScoreInfo_SetLabel_TeamScore(ST_CA_ROUNDS, "rounds", SFL_SORT_PRIO_PRIMARY);
+       ScoreRules_basics_end();
+}
+
 void CA_count_alive_players()
 {
        entity e;
@@ -72,7 +81,7 @@ float CA_CheckWinner()
        {
                Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_OVER);
                Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER);
-               allowed_to_spawn = FALSE;
+               allowed_to_spawn = false;
                round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
                FOR_EACH_PLAYER(e)
                        nades_Clear(e);
@@ -96,7 +105,7 @@ float CA_CheckWinner()
                Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_TIED);
        }
 
-       allowed_to_spawn = FALSE;
+       allowed_to_spawn = false;
        round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
 
        FOR_EACH_PLAYER(e)
@@ -108,15 +117,15 @@ float CA_CheckWinner()
 void CA_RoundStart()
 {
        if(warmup_stage)
-               allowed_to_spawn = TRUE;
+               allowed_to_spawn = true;
        else
-               allowed_to_spawn = FALSE;
+               allowed_to_spawn = false;
 }
 
-float prev_missing_teams_mask;
 float CA_CheckTeams()
 {
-       allowed_to_spawn = TRUE;
+       static float prev_missing_teams_mask;
+       allowed_to_spawn = true;
        CA_count_alive_players();
        if(CA_ALIVE_TEAMS_OK())
        {
@@ -146,14 +155,14 @@ float CA_CheckTeams()
 float ca_isEliminated(entity e)
 {
        if(e.caplayer == 1 && (e.deadflag != DEAD_NO || e.frags == FRAGS_LMS_LOSER))
-               return TRUE;
+               return true;
        if(e.caplayer == 0.5)
-               return TRUE;
-       return FALSE;
+               return true;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(ca_PlayerSpawn)
-{
+{SELFPARAM();
        self.caplayer = 1;
        if(!warmup_stage)
                eliminatedPlayers.SendFlags |= 1;
@@ -161,7 +170,7 @@ MUTATOR_HOOKFUNCTION(ca_PlayerSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(ca_PutClientInServer)
-{
+{SELFPARAM();
        if(!allowed_to_spawn)
        if(IS_PLAYER(self)) // this is true even when player is trying to join
        {
@@ -178,9 +187,11 @@ MUTATOR_HOOKFUNCTION(ca_PutClientInServer)
 }
 
 MUTATOR_HOOKFUNCTION(ca_reset_map_players)
-{
-       FOR_EACH_CLIENT(self)
+{SELFPARAM();
+       entity e;
+       FOR_EACH_CLIENT(e)
        {
+               setself(e);
                self.killcount = 0;
                if(!self.caplayer && IS_BOT_CLIENT(self))
                {
@@ -198,14 +209,14 @@ MUTATOR_HOOKFUNCTION(ca_reset_map_players)
 }
 
 MUTATOR_HOOKFUNCTION(ca_ClientConnect)
-{
+{SELFPARAM();
        self.classname = "observer";
        return 1;
 }
 
 MUTATOR_HOOKFUNCTION(ca_reset_map_global)
 {
-       allowed_to_spawn = TRUE;
+       allowed_to_spawn = true;
        return 1;
 }
 
@@ -216,7 +227,7 @@ MUTATOR_HOOKFUNCTION(ca_GetTeamCount)
 }
 
 entity ca_LastPlayerForTeam()
-{
+{SELFPARAM();
        entity pl, last_pl = world;
        FOR_EACH_PLAYER(pl)
        {
@@ -243,7 +254,7 @@ void ca_LastPlayerForTeam_Notify()
 }
 
 MUTATOR_HOOKFUNCTION(ca_PlayerDies)
-{
+{SELFPARAM();
        ca_LastPlayerForTeam_Notify();
        if(!allowed_to_spawn)
                self.respawn_flags =  RESPAWN_SILENT;
@@ -253,7 +264,7 @@ MUTATOR_HOOKFUNCTION(ca_PlayerDies)
 }
 
 MUTATOR_HOOKFUNCTION(ca_ClientDisconnect)
-{
+{SELFPARAM();
        if(self.caplayer == 1)
                ca_LastPlayerForTeam_Notify();
        return 1;
@@ -265,7 +276,7 @@ MUTATOR_HOOKFUNCTION(ca_ForbidPlayerScore_Clear)
 }
 
 MUTATOR_HOOKFUNCTION(ca_MakePlayerObserver)
-{
+{SELFPARAM();
        if(self.caplayer == 1)
                ca_LastPlayerForTeam_Notify();
        if(self.killindicator_teamchange == -2)
@@ -307,24 +318,24 @@ MUTATOR_HOOKFUNCTION(ca_PlayerDamage)
 {
        if(IS_PLAYER(frag_target))
        if(frag_target.deadflag == DEAD_NO)
-       if(frag_target == frag_attacker || SAME_TEAM(frag_target, frag_attacker) || frag_deathtype == DEATH_FALL)
+       if(frag_target == frag_attacker || SAME_TEAM(frag_target, frag_attacker) || frag_deathtype == DEATH_FALL.m_id)
                frag_damage = 0;
 
        frag_mirrordamage = 0;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(ca_FilterItem)
-{
+{SELFPARAM();
        if(autocvar_g_powerups <= 0)
        if(self.flags & FL_POWERUP)
-               return TRUE;
+               return true;
 
        if(autocvar_g_pickup_items <= 0)
-               return TRUE;
+               return true;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(ca_PlayerDamage_SplitHealthArmor)
@@ -334,25 +345,31 @@ MUTATOR_HOOKFUNCTION(ca_PlayerDamage_SplitHealthArmor)
        if(frag_target != frag_attacker && IS_PLAYER(frag_attacker))
                PlayerTeamScore_Add(frag_attacker, SP_SCORE, ST_SCORE, (frag_damage - excess) * autocvar_g_ca_damage2score_multiplier);
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(ca_PlayerRegen)
 {
        // no regeneration in CA
-       return TRUE;
+       return true;
+}
+
+MUTATOR_HOOKFUNCTION(ca_CountFrags)
+{
+       // announce remaining frags
+       return true;
 }
 
 void ca_Initialize()
 {
-       allowed_to_spawn = TRUE;
+       allowed_to_spawn = true;
 
        ca_teams = autocvar_g_ca_teams_override;
        if(ca_teams < 2)
                ca_teams = autocvar_g_ca_teams;
        ca_teams = bound(2, ca_teams, 4);
        ret_float = ca_teams;
-       ScoreRules_ca(ca_teams);
+       ca_ScoreRules(ca_teams);
 
        round_handler_Spawn(CA_CheckTeams, CA_CheckWinner, CA_RoundStart);
        round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
@@ -384,6 +401,7 @@ MUTATOR_DEFINITION(gamemode_ca)
        MUTATOR_HOOK(FilterItem, ca_FilterItem, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDamage_SplitHealthArmor, ca_PlayerDamage_SplitHealthArmor, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerRegen, ca_PlayerRegen, CBC_ORDER_ANY);
+       MUTATOR_HOOK(Scores_CountFragsRemaining, ca_CountFrags, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {
@@ -394,7 +412,7 @@ MUTATOR_DEFINITION(gamemode_ca)
 
        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;
        }