From cde210548c9aecaf56a1fa32689cda2abbf3ae30 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 28 Sep 2021 02:59:57 +0000 Subject: [PATCH] 1 --- server/gameserver/matchteam.cc | 4 ++-- server/gameserver/matchteam.h | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc index 7b31f6a..414b41c 100644 --- a/server/gameserver/matchteam.cc +++ b/server/gameserver/matchteam.cc @@ -16,8 +16,8 @@ void RawTeamMember::FillMFMatchTeamMember(cs::MFMatchTeamMember* p) *p->mutable_weapons() = msg.weapons(); *p->mutable_skins() = msg.skins(); *p->mutable_skill_list() = msg.skill_list(); - p->set_is_leader(true); - p->set_state(0); + p->set_is_leader(is_leader); + p->set_state(state); } void RawTeamMember::InitRobot() diff --git a/server/gameserver/matchteam.h b/server/gameserver/matchteam.h index 69c4982..63532fb 100644 --- a/server/gameserver/matchteam.h +++ b/server/gameserver/matchteam.h @@ -9,6 +9,12 @@ enum MatchTeamPhase_e kMatchLock = 3 }; +enum MatchTeamMember_e +{ + kMatchReadying = 0, + kMatchPrepare = 2, +}; + namespace cs { class CMJoin; @@ -22,6 +28,8 @@ struct RawTeamMember int socket_handle = 0; cs::CMJoin msg; bool is_robot = false; + bool is_leader = false; + int state = kMatchReadying; void FillMFMatchTeamMember(cs::MFMatchTeamMember* msg); void InitRobot(); };