From 9b6e54b010aafb55a4110ecd776db4a467697a9f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 16 May 2023 19:54:22 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 2 ++ server/gameserver/room.h | 3 +++ server/gameserver/sandtable.cc | 8 ++++++++ server/gameserver/sandtable.h | 11 +++++++++++ 4 files changed, 24 insertions(+) create mode 100644 server/gameserver/sandtable.cc create mode 100644 server/gameserver/sandtable.h diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index bdfab5a0..ae968b4f 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -39,6 +39,7 @@ #include "bornpoint.h" #include "airdrop.h" #include "airraid.h" +#include "sandtable.h" #include "mt/Param.h" #include "mt/Hero.h" @@ -121,6 +122,7 @@ void Room::Init() incubator_ = new Incubator(); incubator_->room = this; incubator_->Init(); + sand_table_ = std::make_shared(this); #ifdef DEBUG InitDebugInfo(); #endif diff --git a/server/gameserver/room.h b/server/gameserver/room.h index cd44d80b..ed9ac1d0 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -34,6 +34,7 @@ struct BornPoint; class MapInstance; struct RoomInitInfo; struct FrameEventData; +class SandTable; struct Plane { @@ -239,6 +240,7 @@ public: int GetPvpMatchMode(); void ForceOver(); bool SupportSandTable(); + std::shared_ptr GetSandTable() { return sand_table_; } private: void ShuaAndroid(); @@ -383,6 +385,7 @@ private: a8::XTimerWp auto_jump_timer_; Incubator* incubator_ = nullptr; + std::shared_ptr sand_table_; bool infinite_bullet_mode_ = false; diff --git a/server/gameserver/sandtable.cc b/server/gameserver/sandtable.cc new file mode 100644 index 00000000..b2a6d73f --- /dev/null +++ b/server/gameserver/sandtable.cc @@ -0,0 +1,8 @@ +#include "precompile.h" + +#include "sandtable.h" + +SandTable::SandTable(Room* room): room_(room) +{ + +} diff --git a/server/gameserver/sandtable.h b/server/gameserver/sandtable.h new file mode 100644 index 00000000..b3ac9b4d --- /dev/null +++ b/server/gameserver/sandtable.h @@ -0,0 +1,11 @@ +#pragma once + +class Room; +class SandTable +{ + public: + SandTable(Room* room); + +private: + Room* room_ = nullptr; +};