Merge branch 'master' into terencehill/bot_ai

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / default / bot.qc

diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index b3a143b9a7b02a6142dd7019694df6521957e153..f03bdfc74db470c44ba0927aef9383dd079d7bf1 100644 (file)
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -434,15 +434,15 @@ void bot_clientconnect(entity this)
        else if(this.bot_forced_team==4)
                this.team = NUM_TEAM_4;
        else
        else if(this.bot_forced_team==4)
                this.team = NUM_TEAM_4;
        else

-               JoinBestTeam(this, true);
+               TeamBalance_JoinBestTeam(this, true);

 
        havocbot_setupbot(this);
 }
 
 void bot_removefromlargestteam()
 {
 
        havocbot_setupbot(this);
 }
 
 void bot_removefromlargestteam()
 {

-       CheckAllowedTeams(NULL);
-       GetTeamCounts(NULL);
+       entity balance = TeamBalance_CheckAllowedTeams(NULL);
+       TeamBalance_GetTeamCounts(balance, NULL);

 
        entity best = NULL;
        float besttime = 0;
 
        entity best = NULL;
        float besttime = 0;


@@ -461,12 +461,10 @@ void bot_removefromlargestteam()
 
                int thiscount = 0;
 
 
                int thiscount = 0;
 

-               switch(it.team)
+               if (Team_IsValidTeam(it.team))

                {
                {

-                       case NUM_TEAM_1: thiscount = c1; break;
-                       case NUM_TEAM_2: thiscount = c2; break;
-                       case NUM_TEAM_3: thiscount = c3; break;
-                       case NUM_TEAM_4: thiscount = c4; break;
+                       thiscount = TeamBalance_GetNumberOfPlayers(balance,
+                               Team_TeamToIndex(it.team));

                }
 
                if(thiscount > bestcount)
                }
 
                if(thiscount > bestcount)


@@ -481,6 +479,7 @@ void bot_removefromlargestteam()
                        best = it;
                }
        });
                        best = it;
                }
        });

+       TeamBalance_Destroy(balance);

        if(!bcount)
                return; // no bots to remove
        currentbots = currentbots - 1;
        if(!bcount)
                return; // no bots to remove
        currentbots = currentbots - 1;