Merge b902b5484e into 8cf0abb1b1

src/world/Types.hpp

@@ -1,8 +0,0 @@
-#ifndef WORLD_TYPES_HPP
-#define WORLD_TYPES_HPP
-
-#include <cstdint>
-
-typedef uintptr_t HWORLDOBJECT;
-
-#endif

src/world/map/CMap.cpp

@@ -1,7 +1,6 @@
 #include "world/map/CMap.hpp"
 #include <storm/String.hpp>
 
-STORM_EXPLICIT_LIST(CMapBaseObj, m_lameAssLink) CMap::s_entityList;
 char CMap::s_mapName[256];
 char CMap::s_mapPath[256];
 char CMap::s_wdtFilename[256];

src/world/map/CMap.hpp

@@ -1,14 +1,11 @@
 #ifndef WORLD_MAP_C_MAP_HPP
 #define WORLD_MAP_C_MAP_HPP
 
-#include "world/map/CMapBaseObj.hpp"
-#include <storm/List.hpp>
 #include <cstdint>
 
 class CMap {
     public:
         // Static variables
-        static STORM_EXPLICIT_LIST(CMapBaseObj, m_lameAssLink) s_entityList;
         static char s_mapName[];
         static char s_mapPath[];
         static char s_wdtFilename[];

src/world/map/CMapBaseObj.cpp

@@ -1,5 +0,0 @@
-#include "world/map/CMapBaseObj.hpp"
-
-uint32_t CMapBaseObj::GetType() {
-    return this->m_type;
-}

src/world/map/CMapBaseObj.hpp

@@ -1,54 +0,0 @@
-#ifndef WORLD_MAP_C_MAP_BASE_OBJ_HPP
-#define WORLD_MAP_C_MAP_BASE_OBJ_HPP
-
-#include <storm/List.hpp>
-#include <cstdint>
-
-class CM2Lighting;
-class CMapBaseObj;
-
-class CMapBaseObjLink {
-    public:
-        // Member variables
-        uint32_t memHandle;
-        CMapBaseObj* owner;
-        CMapBaseObj* ref;
-        TSLink<CMapBaseObjLink> refLink;
-        TSLink<CMapBaseObjLink> ownerLink;
-};
-
-class CMapBaseObj {
-    public:
-        // Enums
-        enum {
-            Type_BaseObj        = 0x1,
-            Type_Area           = 0x2,
-            Type_Chunk          = 0x4,
-            Type_MapObjDef      = 0x8,
-            Type_MapObjDefGroup = 0x10,
-            Type_Entity         = 0x20,
-            Type_DoodadDef      = 0x40,
-            Type_Light          = 0x80,
-        };
-
-        // Public member variables
-        uint32_t m_memHandle;
-        TSLink<CMapBaseObj> m_lameAssLink;
-        STORM_EXPLICIT_LIST(CMapBaseObjLink, ownerLink) m_parentLinkList;
-
-        // TODO
-
-        // Public virtual member functions
-        virtual ~CMapBaseObj() = default;
-        virtual void SelectLights(CM2Lighting* lighting) {};
-        virtual void SelectUnderwater(CM2Lighting* lighting) {};
-
-        // Public member functions
-        uint32_t GetType();
-
-    protected:
-        // Protected member variables
-        uint16_t m_type = Type_BaseObj;
-};
-
-#endif

src/world/map/CMapEntity.hpp

@@ -1,11 +0,0 @@
-#ifndef WORLD_MAP_C_MAP_ENTITY_HPP
-#define WORLD_MAP_C_MAP_ENTITY_HPP
-
-#include "world/map/CMapStaticEntity.hpp"
-
-class CMapEntity : public CMapStaticEntity {
-    public:
-        // TODO
-};
-
-#endif

src/world/map/CMapStaticEntity.hpp

@@ -1,11 +0,0 @@
-#ifndef WORLD_MAP_C_MAP_STATIC_ENTITY_HPP
-#define WORLD_MAP_C_MAP_STATIC_ENTITY_HPP
-
-#include "world/map/CMapBaseObj.hpp"
-
-class CMapStaticEntity : public CMapBaseObj {
-    public:
-        // TODO
-};
-
-#endif