From 926c4cae7b6f0b055becc8cec229d2da47c080f8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 22 Mar 2022 13:37:17 +0800
Subject: [PATCH] 1

---
 server/gameserver/roommgr.cc | 14 ++++++++------
 server/gameserver/roommgr.h  |  5 ++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index ecfed6ed..2a39fadf 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -24,12 +24,6 @@
 const int ROOM_NUM_UP_LIMIT = 1000;
 const int HUM_NUM_DOWN_LIMIT = 2500;
 
-struct JoinRequest
-{
-    f8::MsgHdr hdr;
-    cs::CMJoin msg;
-};
-
 static RoomType_e GetHumanRoomType(const cs::CMJoin& msg, int& game_times)
 {
     #if 1
@@ -656,6 +650,7 @@ void RoomMgr::TeamRoomTimeOut(const std::string& team_uuid)
     }
 }
 
+#if 0
 void RoomMgr::OnJoinResponse(JoinRequest* req)
 {
     f8::MsgHdr& hdr = req->hdr;
@@ -708,3 +703,10 @@ void RoomMgr::OnJoinResponse(JoinRequest* req)
     }
     OnJoinRoomOk(msg, hum);
 }
+#endif
+
+void RoomMgr::SendGetBattleData(std::vector<std::shared_ptr<cs::CMJoin>>& join_msgs,
+                                std::function<void(std::vector<std::tuple<int, std::string>>)> cb)
+{
+
+}
diff --git a/server/gameserver/roommgr.h b/server/gameserver/roommgr.h
index cb3f8796..717293fa 100644
--- a/server/gameserver/roommgr.h
+++ b/server/gameserver/roommgr.h
@@ -14,7 +14,6 @@ namespace MetaData
     struct MapTplThing;
 }
 
-struct JoinRequest;
 class GridService;
 class MapService;
 class MapInstance;
@@ -72,6 +71,8 @@ class RoomMgr : public a8::Singleton<RoomMgr>
     void AddOverRoom(long long room_uuid);
     bool IsGM(const std::string& account_id);
     void JoinTeam(MatchTeam* team);
+    void SendGetBattleData(std::vector<std::shared_ptr<cs::CMJoin>>& join_msgs,
+                           std::function<void(std::vector<std::tuple<int, std::string>>)> cb);
 
  private:
     void InstallReportStateTimer();
@@ -99,7 +100,6 @@ class RoomMgr : public a8::Singleton<RoomMgr>
     std::string GenTeamHashData(const std::string& team_uuid, std::map<std::string, long long>* team_hash);
     void OnJoinRoomOk(const cs::CMJoin& msg, Player* hum);
     void TeamRoomTimeOut(const std::string& team_uuid);
-    void OnJoinResponse(JoinRequest* req);
 
  private:
     int current_room_idx_ = 0;
@@ -111,5 +111,4 @@ class RoomMgr : public a8::Singleton<RoomMgr>
     a8::TimerAttacher reportstate_timer_attacher_;
     std::map<std::string, int> gm_hash_;
     std::map<std::string, std::map<std::string, long long>> team_room_hash_;
-    std::map<std::string, JoinRequest*> join_request_hash_;
 };