Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/mutators/gamemode_assault.qc b/qcsrc/server/mutators/gamemode_assault.qc
index 7b55be4786c88e281817315a86dbce59e0e50ca6..94e104728f3ab27271f920c49edfe2d474e2c13e 100644 (file)
--- a/qcsrc/server/mutators/gamemode_assault.qc
+++ b/qcsrc/server/mutators/gamemode_assault.qc
@@ -178,10 +178,10 @@ void assault_roundstart_use()
        ent = find(world, classname, "turret_main");
        while(ent) {
                // Swap turret teams
-               if(ent.team == COLOR_TEAM1)
-                       ent.team = COLOR_TEAM2;
+               if(ent.team == NUM_TEAM_1)
+                       ent.team = NUM_TEAM_2;
                else
-                       ent.team = COLOR_TEAM1;
+                       ent.team = NUM_TEAM_1;
 
                self = ent;
 
@@ -241,22 +241,20 @@ void assault_new_round()
        self.winning = self.winning + 1;
 
        // swap attacker/defender roles
-       if(assault_attacker_team == COLOR_TEAM1) {
-               assault_attacker_team = COLOR_TEAM2;
-       } else {
-               assault_attacker_team = COLOR_TEAM1;
-       }
-
+       if(assault_attacker_team == NUM_TEAM_1)
+               assault_attacker_team = NUM_TEAM_2;
+       else
+               assault_attacker_team = NUM_TEAM_1;
 
        entity ent;
        for(ent = world; (ent = nextent(ent)); )
        {
                if(clienttype(ent) == CLIENTTYPE_NOTACLIENT)
                {
-                       if(ent.team_saved == COLOR_TEAM1)
-                               ent.team_saved = COLOR_TEAM2;
-                       else if(ent.team_saved == COLOR_TEAM2)
-                               ent.team_saved = COLOR_TEAM1;
+                       if(ent.team_saved == NUM_TEAM_1)
+                               ent.team_saved = NUM_TEAM_2;
+                       else if(ent.team_saved == NUM_TEAM_2)
+                               ent.team_saved = NUM_TEAM_1;
                }
        }
 
@@ -268,33 +266,24 @@ void assault_new_round()
 // spawnfuncs
 void spawnfunc_info_player_attacker()
 {
-       if not(g_assault)
-       {
-               remove(self);
-               return;
-       }
-       self.team = COLOR_TEAM1; // red, gets swapped every round
+       if not(g_assault) { remove(self); return; }
+       
+       self.team = NUM_TEAM_1; // red, gets swapped every round
        spawnfunc_info_player_deathmatch();
 }
 
 void spawnfunc_info_player_defender()
 {
-       if not(g_assault)
-       {
-               remove(self);
-               return;
-       }
-       self.team = COLOR_TEAM2; // blue, gets swapped every round
+       if not(g_assault) { remove(self); return; }
+       
+       self.team = NUM_TEAM_2; // blue, gets swapped every round
        spawnfunc_info_player_deathmatch();
 }
 
 void spawnfunc_target_objective()
 {
-       if not(g_assault)
-       {
-               remove(self);
-               return;
-       }
+       if not(g_assault) { remove(self); return; }
+       
        self.classname = "target_objective";
        self.use = assault_objective_use;
        assault_objective_reset();
@@ -304,11 +293,7 @@ void spawnfunc_target_objective()
 
 void spawnfunc_target_objective_decrease()
 {
-       if not(g_assault)
-       {
-               remove(self);
-               return;
-       }
+       if not(g_assault) { remove(self); return; }
 
        self.classname = "target_objective_decrease";
 
@@ -326,29 +311,23 @@ void spawnfunc_target_objective_decrease()
 // destructible walls that can be used to trigger target_objective_decrease
 void spawnfunc_func_assault_destructible()
 {
-       if not(g_assault)
-       {
-               remove(self);
-               return;
-       }
+       if not(g_assault) { remove(self); return; }
+       
        self.spawnflags = 3;
        self.classname = "func_assault_destructible";
        
-       if(assault_attacker_team == COLOR_TEAM1)
-               self.team = COLOR_TEAM2;
+       if(assault_attacker_team == NUM_TEAM_1)
+               self.team = NUM_TEAM_2;
        else
-               self.team = COLOR_TEAM1;
+               self.team = NUM_TEAM_1;
 
        spawnfunc_func_breakable();
 }
 
 void spawnfunc_func_assault_wall()
 {
-       if not(g_assault)
-       {
-               remove(self);
-               return;
-       }
+       if not(g_assault) { remove(self); return; }
+       
        self.classname = "func_assault_wall";
        self.mdl = self.model;
        setmodel(self, self.mdl);
@@ -360,11 +339,8 @@ void spawnfunc_func_assault_wall()
 
 void spawnfunc_target_assault_roundend()
 {
-       if not(g_assault)
-       {
-               remove(self);
-               return;
-       }
+       if not(g_assault) { remove(self); return; }
+
        self.winning = 0; // round not yet won by attackers
        self.classname = "target_assault_roundend";
        self.use = target_assault_roundend_use;
@@ -374,12 +350,9 @@ void spawnfunc_target_assault_roundend()
 
 void spawnfunc_target_assault_roundstart()
 {
-       if not(g_assault)
-       {
-               remove(self);
-               return;
-       }
-       assault_attacker_team = COLOR_TEAM1;
+       if not(g_assault) { remove(self); return; }
+       
+       assault_attacker_team = NUM_TEAM_1;
        self.classname = "target_assault_roundstart";
        self.use = assault_roundstart_use;
        self.reset2 = assault_roundstart_use;
@@ -569,11 +542,6 @@ void havocbot_ast_reset_role(entity bot)
                havocbot_role_ast_setrole(bot, HAVOCBOT_AST_ROLE_DEFENSE);
 }
 
-void havocbot_chooserole_ast()
-{
-       havocbot_ast_reset_role(self);
-}
-
 // mutator hooks
 MUTATOR_HOOKFUNCTION(assault_PlayerSpawn)
 {
@@ -602,7 +570,7 @@ MUTATOR_HOOKFUNCTION(assault_VehicleSpawn)
 
 MUTATOR_HOOKFUNCTION(assault_BotRoles)
 {
-       havocbot_chooserole_ast();
+       havocbot_ast_reset_role(self);
        return TRUE;
 }