From e650fbe947dd53849cfe353c1b3e584b9b0e4d72 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 23 Sep 2023 09:44:39 +0800
Subject: [PATCH] add GetMaxTeamNum

---
 server/gameserver/room.cc | 14 +++++++-------
 server/gameserver/team.cc |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index fc9e6f99..36b55eab 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1117,7 +1117,7 @@ bool Room::CanJoin(class MatchTeam* team)
 #endif
     }
 #if 0
-    if (team->GetCurrMembers().size() != MAX_TEAM_NUM) {
+    if (team->GetCurrMembers().size() != GetMaxTeamNum()) {
         return false;
     }
 #endif
@@ -1274,7 +1274,7 @@ void Room::UpdateGas()
                 }
             } else {
                 if (!IsGameOver() &&
-                    alive_count_ <= MAX_TEAM_NUM &&
+                    alive_count_ <= GetMaxTeamNum() &&
                     GetAliveTeamNum() <= 1) {
                     game_over_ = true;
                     game_over_frameno_ = GetFrameNo();
@@ -1758,12 +1758,12 @@ void Room::CombineTeam()
                     }
                 }
                 if (team_id1 != team_id2) {
-                    if (pair1.second + pair2.second <= MAX_TEAM_NUM) {
+                    if (pair1.second + pair2.second <= GetMaxTeamNum()) {
                         int new_team_num = pair1.second + pair2.second;
                         {
                             Team* team1 = team_hash_[team_id1];
                             Team* team2 = team_hash_[team_id2];
-                            if (team1->GetMemberNum() + team2->GetMemberNum() > MAX_TEAM_NUM) {
+                            if (team1->GetMemberNum() + team2->GetMemberNum() > GetMaxTeamNum()) {
                                 f8::UdpLog::Instance()->Warning("team_member > 4 :%d",
                                                                 {
                                                                  team1->GetMemberNum() + team2->GetMemberNum()
@@ -1795,7 +1795,7 @@ void Room::CombineTeam()
                             need_combine_teams_copy.erase(team_id2);
                         } else {
                             if (pair1.second >= pair2.second) {
-                                if (pair1.second + pair2.second >= MAX_TEAM_NUM) {
+                                if (pair1.second + pair2.second >= GetMaxTeamNum()) {
                                     need_combine_teams.erase(team_id1);
                                     need_combine_teams_copy.erase(team_id1);
                                 } else {
@@ -1808,7 +1808,7 @@ void Room::CombineTeam()
                                 need_combine_teams.erase(team_id2);
                                 need_combine_teams_copy.erase(team_id2);
                             } else {
-                                if (pair1.second + pair2.second >= MAX_TEAM_NUM) {
+                                if (pair1.second + pair2.second >= GetMaxTeamNum()) {
                                     need_combine_teams.erase(team_id2);
                                     need_combine_teams_copy.erase(team_id2);
                                 } else {
@@ -1848,7 +1848,7 @@ void Room::FillTeam()
             break;
         }
         if (!pair.second->GetTeam()->IsFull()) {
-            for (int i = pair.second->GetTeam()->GetMemberNum(); i < MAX_TEAM_NUM; ++i) {
+            for (int i = pair.second->GetTeam()->GetMemberNum(); i < GetMaxTeamNum(); ++i) {
                 if (!free_team_list.empty()) {
                     Team* b_team = free_team_list.at(free_team_list.size() - 1);
                     pair.second->GetTeam()->CombineTeam(b_team);
diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc
index f9958a41..2760529d 100644
--- a/server/gameserver/team.cc
+++ b/server/gameserver/team.cc
@@ -92,7 +92,7 @@ void Team::AddMember(Human* member)
 
 bool Team::IsFull()
 {
-    return GetMemberNum() >= MAX_TEAM_NUM;
+    return GetMemberNum() >= room->GetMaxTeamNum();
 }
 
 void Team::CombineBornPoint()
@@ -161,7 +161,7 @@ Human* Team::GetMemberByUniId(int member_id)
 
 bool Team::CanCombine(Human* member)
 {
-    return !IsFull() && (combined_team_member_num_ + member->init_team_member_num < MAX_TEAM_NUM);
+    return !IsFull() && (combined_team_member_num_ + member->init_team_member_num < room->GetMaxTeamNum());
 }
 
 void Team::AddCombineMemberNum(int member_num)