1
This commit is contained in:
parent
7c82916362
commit
6b3926a88d
@ -131,7 +131,6 @@ static void Human_FillBodyState(Human* self, ::google::protobuf::RepeatedPtrFiel
|
|||||||
|
|
||||||
static Player* InternalCreatePlayer(std::shared_ptr<CustomBattle> p,
|
static Player* InternalCreatePlayer(std::shared_ptr<CustomBattle> p,
|
||||||
std::shared_ptr<CustomMember> m,
|
std::shared_ptr<CustomMember> m,
|
||||||
std::shared_ptr<CustomTeam> net_team,
|
|
||||||
std::shared_ptr<Team> room_team,
|
std::shared_ptr<Team> room_team,
|
||||||
cs::CMJoin& join_msg)
|
cs::CMJoin& join_msg)
|
||||||
{
|
{
|
||||||
@ -2790,13 +2789,22 @@ int Room::InitWithCustomBattle(long ip_saddr, int socket_handle, std::shared_ptr
|
|||||||
auto room_team = room_teams.at(i);
|
auto room_team = room_teams.at(i);
|
||||||
net_team->TraverseMember
|
net_team->TraverseMember
|
||||||
(
|
(
|
||||||
[join_msg, p, net_team, room_team] (std::shared_ptr<CustomMember> m) mutable -> bool
|
[join_msg, p, room_team] (std::shared_ptr<CustomMember> m) mutable -> bool
|
||||||
{
|
{
|
||||||
Player* hum = InternalCreatePlayer(p, m, net_team, room_team, join_msg);
|
Player* hum = InternalCreatePlayer(p, m, room_team, join_msg);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
p->TraverseObList
|
||||||
|
(
|
||||||
|
[join_msg, p] (std::shared_ptr<CustomMember> m) mutable -> bool
|
||||||
|
{
|
||||||
|
Player* hum = InternalCreatePlayer(p, m, nullptr, join_msg);
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
}
|
||||||
{
|
{
|
||||||
auto hum = GetPlayerByAccountId(msg->account_id());
|
auto hum = GetPlayerByAccountId(msg->account_id());
|
||||||
if (hum) {
|
if (hum) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user