From 0df20b549b34bdadb8917ccb57d70ced0f9439f9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 25 Feb 2023 15:28:05 +0800 Subject: [PATCH] 1 --- server/gameserver/mt/Map.h | 7 +++++++ server/gameserver/mt/MetaMgr.cc | 2 -- server/gameserver/mt/WorldObject.cc | 18 ------------------ server/gameserver/mt/WorldObject.h | 19 ------------------- 4 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 server/gameserver/mt/WorldObject.cc delete mode 100644 server/gameserver/mt/WorldObject.h diff --git a/server/gameserver/mt/Map.h b/server/gameserver/mt/Map.h index fa0e02d9..853a6b11 100644 --- a/server/gameserver/mt/Map.h +++ b/server/gameserver/mt/Map.h @@ -7,6 +7,13 @@ namespace mt { class MapCollider; + struct WorldObject + { + int object_id = 0; + int object_type = 0; + glm::vec3 pos; + }; + DECLARE_ID_TABLE(Map, mtb::Map, "map@map.json", "map_id") diff --git a/server/gameserver/mt/MetaMgr.cc b/server/gameserver/mt/MetaMgr.cc index 882261f2..5af8eaf4 100644 --- a/server/gameserver/mt/MetaMgr.cc +++ b/server/gameserver/mt/MetaMgr.cc @@ -37,7 +37,6 @@ #include "mt/MapCollider.h" #include "mt/Grasp.h" #include "mt/GraspBuff.h" -#include "mt/WorldObject.h" #include "app.h" @@ -104,7 +103,6 @@ namespace mt RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); - RegMetaTable(res_path_); } void MetaMgr::Load() diff --git a/server/gameserver/mt/WorldObject.cc b/server/gameserver/mt/WorldObject.cc deleted file mode 100644 index 7b869c5b..00000000 --- a/server/gameserver/mt/WorldObject.cc +++ /dev/null @@ -1,18 +0,0 @@ -#include "precompile.h" - -#include "mt/WorldObject.h" - -IMPL_TABLE(mt::WorldObject) - -namespace mt -{ - - void WorldObject::Init1() - { - } - - void WorldObject::Init2() - { - } - -} diff --git a/server/gameserver/mt/WorldObject.h b/server/gameserver/mt/WorldObject.h deleted file mode 100644 index dbb90554..00000000 --- a/server/gameserver/mt/WorldObject.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "mt/macro.h" -#include "mtb/WorldObject.h" - -namespace mt -{ - - DECLARE_AUTO_ID_TABLE(WorldObject, mtb::WorldObject, - "world_object@world_object.json" - ) - public: - - void Init1(); - void Init2(); - - }; - -}