From b75c7cee45c0e935774e073867ff76f4b210e3d4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 22 Mar 2022 14:07:44 +0800 Subject: [PATCH] 1 --- server/gameserver/roommgr.cc | 9 +++++++-- server/gameserver/roommgr.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 2a39fadf..24998b3f 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -147,7 +147,12 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg) MatchMgr::Instance()->_CMJoin(hdr, msg); return; } - + std::vector> join_msgs; + auto cb = + [] (std::vector>&) + { + }; + SendGetBattleData(join_msgs, cb); } void RoomMgr::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg) @@ -706,7 +711,7 @@ void RoomMgr::OnJoinResponse(JoinRequest* req) #endif void RoomMgr::SendGetBattleData(std::vector>& join_msgs, - std::function>)> cb) + std::function>&)> cb) { } diff --git a/server/gameserver/roommgr.h b/server/gameserver/roommgr.h index 717293fa..9538f266 100644 --- a/server/gameserver/roommgr.h +++ b/server/gameserver/roommgr.h @@ -72,7 +72,7 @@ class RoomMgr : public a8::Singleton bool IsGM(const std::string& account_id); void JoinTeam(MatchTeam* team); void SendGetBattleData(std::vector>& join_msgs, - std::function>)> cb); + std::function>&)> cb); private: void InstallReportStateTimer();