server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add GetMaxTeamNum

Browse Source
This commit is contained in:
aozhiwei 2023-09-23 09:44:39 +08:00
parent 3ec093471a
commit e650fbe947
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/gameserver/room.cc
View File

@ -1117,7 +1117,7 @@ bool Room::CanJoin(class MatchTeam* team)
#endif #endif
} }
#if 0 #if 0
if (team->GetCurrMembers().size() != MAX_TEAM_NUM) { if (team->GetCurrMembers().size() != GetMaxTeamNum()) {
return false; return false;
} }
#endif #endif
@ -1274,7 +1274,7 @@ void Room::UpdateGas()
} }
} else { } else {
if (!IsGameOver() && if (!IsGameOver() &&
alive_count_ <= MAX_TEAM_NUM && alive_count_ <= GetMaxTeamNum() &&
GetAliveTeamNum() <= 1) { GetAliveTeamNum() <= 1) {
game_over_ = true; game_over_ = true;
game_over_frameno_ = GetFrameNo(); game_over_frameno_ = GetFrameNo();
@ -1758,12 +1758,12 @@ void Room::CombineTeam()
} }
} }
if (team_id1 != team_id2) { 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; int new_team_num = pair1.second + pair2.second;
{ {
Team* team1 = team_hash_[team_id1]; Team* team1 = team_hash_[team_id1];
Team* team2 = team_hash_[team_id2]; 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", f8::UdpLog::Instance()->Warning("team_member > 4 :%d",
{ {
team1->GetMemberNum() + team2->GetMemberNum() team1->GetMemberNum() + team2->GetMemberNum()
@ -1795,7 +1795,7 @@ void Room::CombineTeam()
need_combine_teams_copy.erase(team_id2); need_combine_teams_copy.erase(team_id2);
} else { } else {
if (pair1.second >= pair2.second) { 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.erase(team_id1);
need_combine_teams_copy.erase(team_id1); need_combine_teams_copy.erase(team_id1);
} else { } else {
@ -1808,7 +1808,7 @@ void Room::CombineTeam()
need_combine_teams.erase(team_id2); need_combine_teams.erase(team_id2);
need_combine_teams_copy.erase(team_id2); need_combine_teams_copy.erase(team_id2);
} else { } else {
if (pair1.second + pair2.second >= MAX_TEAM_NUM) { if (pair1.second + pair2.second >= GetMaxTeamNum()) {
need_combine_teams.erase(team_id2); need_combine_teams.erase(team_id2);
need_combine_teams_copy.erase(team_id2); need_combine_teams_copy.erase(team_id2);
} else { } else {
@ -1848,7 +1848,7 @@ void Room::FillTeam()
break; break;
} }
if (!pair.second->GetTeam()->IsFull()) { 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()) { if (!free_team_list.empty()) {
Team* b_team = free_team_list.at(free_team_list.size() - 1); Team* b_team = free_team_list.at(free_team_list.size() - 1);
pair.second->GetTeam()->CombineTeam(b_team); pair.second->GetTeam()->CombineTeam(b_team);

4
server/gameserver/team.cc
View File

@ -92,7 +92,7 @@ void Team::AddMember(Human* member)
bool Team::IsFull() bool Team::IsFull()
{ {
return GetMemberNum() >= MAX_TEAM_NUM; return GetMemberNum() >= room->GetMaxTeamNum();
} }
void Team::CombineBornPoint() void Team::CombineBornPoint()
@ -161,7 +161,7 @@ Human* Team::GetMemberByUniId(int member_id)
bool Team::CanCombine(Human* member) 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) void Team::AddCombineMemberNum(int member_num)