From a7a372bc9c5504aeba1db5c39fa685f4fb717bae Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 21 Jun 2019 09:24:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=9F=E4=BC=8D=E6=B7=BB=E5=8A=A04=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/constant.h | 3 +++ server/gameserver/room.cc | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index 5161461..31676f8 100755 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -170,3 +170,6 @@ const int MAX_NODE_ID = 8; const int MAX_INSTANCE_ID = 500; const int WALK_ZONE_WIDTH = 100; + +const int MAX_TEAM_NUM = 4; + diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index b3ab779..5ef6103 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1087,9 +1087,11 @@ void Room::MatchTeam(Human* hum) pair.second->team_members = &team_hash_[pair.second->team_id]; pair.second->team_members->insert(pair.second); } - pair.second->team_members->insert(hum); - hum->team_id = pair.second->team_id; - hum->team_members = pair.second->team_members; + if (pair.second->team_members->size() < MAX_TEAM_NUM) { + pair.second->team_members->insert(hum); + hum->team_id = pair.second->team_id; + hum->team_members = pair.second->team_members; + } break; } }