RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 00:02:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(world): populate CMapBaseObj
Some checks are pending
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:cl compiler_name:MSVC cxx:cl os:windows-latest system_name:Windows test_path:WhoaTest]) (push) Waiting to run
Details
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:clang compiler_name:Clang cxx:clang++ os:macos-latest system_name:macOS test_path:WhoaTest]) (push) Waiting to run
Details
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:gcc compiler_name:GCC cxx:g++ os:ubuntu-latest system_name:Linux test_path:WhoaTest]) (push) Waiting to run
Details

Browse Source
This commit is contained in:
fallenoak 2026-01-21 16:06:21 -06:00
parent 536c94a7b7
commit aa62781560
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
4 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/world/map/CMap.cpp
View File

@ -1,6 +1,7 @@
#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];

3
src/world/map/CMap.hpp
View File

@ -1,11 +1,14 @@
#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[];

5
src/world/map/CMapBaseObj.cpp Normal file
View File

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

45
src/world/map/CMapBaseObj.hpp
View File

@ -1,9 +1,54 @@
#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