From 8c8a330d8c43fabb4b0777d6e75a7ef9e647d82f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 27 Sep 2021 03:49:31 +0000
Subject: [PATCH] add matchmgr

---
 server/gameserver/app.cc      |  3 +++
 server/gameserver/match.cc    |  8 --------
 server/gameserver/match.h     | 11 -----------
 server/gameserver/matchmgr.cc | 13 +++++++++++++
 server/gameserver/matchmgr.h  | 15 +++++++++++++++
 server/gameserver/room.cc     |  5 -----
 server/gameserver/room.h      |  2 --
 7 files changed, 31 insertions(+), 26 deletions(-)
 delete mode 100644 server/gameserver/match.cc
 delete mode 100644 server/gameserver/match.h
 create mode 100644 server/gameserver/matchmgr.cc
 create mode 100644 server/gameserver/matchmgr.h

diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc
index 0bb4e9e..e3ca13f 100644
--- a/server/gameserver/app.cc
+++ b/server/gameserver/app.cc
@@ -36,6 +36,7 @@
 #include "collider.h"
 
 #include "tracemgr.h"
+#include "matchmgr.h"
 
 struct MsgNode
 {
@@ -206,6 +207,7 @@ bool App::Init(int argc, char* argv[])
     uuid.SetMachineId((node_id - 1) * MAX_NODE_ID + instance_id);
     KillMgr::Instance()->Init();
     RoomMgr::Instance()->Init();
+    MatchMgr::Instance()->Init();
     MapMgr::Instance()->Init();
     PlayerMgr::Instance()->Init();
     GGListener::Instance()->Init();
@@ -244,6 +246,7 @@ void App::UnInit()
     GGListener::Instance()->UnInit();
     PlayerMgr::Instance()->UnInit();
     MapMgr::Instance()->UnInit();
+    MatchMgr::Instance()->UnInit();
     RoomMgr::Instance()->UnInit();
     KillMgr::Instance()->UnInit();
     EntityFactory::Instance()->UnInit();
diff --git a/server/gameserver/match.cc b/server/gameserver/match.cc
deleted file mode 100644
index 0f2e3f5..0000000
--- a/server/gameserver/match.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "precompile.h"
-
-#include "match.h"
-
-void Match::Init()
-{
-
-}
diff --git a/server/gameserver/match.h b/server/gameserver/match.h
deleted file mode 100644
index 22fc857..0000000
--- a/server/gameserver/match.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-class Room;
-class Match
-{
- public:
-    Room* room = nullptr;
-
-    void Init();
-
-};
diff --git a/server/gameserver/matchmgr.cc b/server/gameserver/matchmgr.cc
new file mode 100644
index 0000000..a72d1b1
--- /dev/null
+++ b/server/gameserver/matchmgr.cc
@@ -0,0 +1,13 @@
+#include "precompile.h"
+
+#include "matchmgr.h"
+
+void MatchMgr::Init()
+{
+
+}
+
+void MatchMgr::UnInit()
+{
+
+}
diff --git a/server/gameserver/matchmgr.h b/server/gameserver/matchmgr.h
new file mode 100644
index 0000000..e093076
--- /dev/null
+++ b/server/gameserver/matchmgr.h
@@ -0,0 +1,15 @@
+#pragma once
+
+class Room;
+class MatchMgr : public a8::Singleton<MatchMgr>
+{
+
+ private:
+    MatchMgr() {};
+    friend class a8::Singleton<MatchMgr>;
+
+public:
+    void Init();
+    void UnInit();
+
+};
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index ad413ff..aea9878 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -33,7 +33,6 @@
 #include "mapmgr.h"
 #include "incubator.h"
 #include "team.h"
-#include "match.h"
 
 const int SHUA_RANGE = 580;
 
@@ -91,9 +90,6 @@ void Room::Init()
     incubator_ = new Incubator();
     incubator_->room = this;
     incubator_->Init();
-    match_ = new Match();
-    match_->room = this;
-    match_->Init();
     if (room_type_ == RT_NewBrid && creator_game_times_ <= 0) {
         CreateLevel0RoomSpecThings();
     }
@@ -109,7 +105,6 @@ void Room::UnInit()
     UnInitDebugInfo();
     #endif
     incubator_->UnInit();
-    A8_SAFE_DELETE(match_);
     A8_SAFE_DELETE(incubator_);
     timer_attacher.ClearTimerList();
     xtimer_attacher_.ClearTimerList();
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 819e859..90c31af 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -40,7 +40,6 @@ class Car;
 class Hero;
 class Incubator;
 class Team;
-class Match;
 class MapInstance;
 struct RoomInitInfo;
 struct ObstacleData
@@ -378,7 +377,6 @@ private:
     xtimer_list* auto_jump_timer_ = nullptr;
 
     Incubator* incubator_ = nullptr;
-    Match* match_ = nullptr;
 
     bool infinite_bullet_mode_ = false;