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

feat(world): set CMap::s_mapID in CMap::Load

Browse Source
This commit is contained in:
fallenoak 2026-02-17 19:35:22 -06:00
parent 2145348935
commit 09c016c935
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ uint32_t* CMap::s_mapObjDefGroupHeap;
uint32_t* CMap::s_mapObjDefHeap; uint32_t* CMap::s_mapObjDefHeap;
uint32_t* CMap::s_mapObjGroupHeap; uint32_t* CMap::s_mapObjGroupHeap;
uint32_t* CMap::s_mapObjHeap; uint32_t* CMap::s_mapObjHeap;
int32_t CMap::s_mapID = -1;
char CMap::s_mapName[256]; char CMap::s_mapName[256];
char CMap::s_mapPath[256]; char CMap::s_mapPath[256];
char CMap::s_wdtFilename[256]; char CMap::s_wdtFilename[256];
@ -61,7 +62,7 @@ void CMap::Initialize() {
// TODO // TODO
} }
void CMap::Load(const char* mapName, int32_t zoneID) { void CMap::Load(const char* mapName, int32_t mapID) {
// TODO // TODO
auto nameOfs = SStrCopy(CMap::s_mapPath, "World\\Maps\\"); auto nameOfs = SStrCopy(CMap::s_mapPath, "World\\Maps\\");
@ -72,6 +73,10 @@ void CMap::Load(const char* mapName, int32_t zoneID) {
SStrPrintf(CMap::s_wdtFilename, sizeof(CMap::s_wdtFilename), "%s\\%s.wdt", CMap::s_mapPath, CMap::s_mapName); SStrPrintf(CMap::s_wdtFilename, sizeof(CMap::s_wdtFilename), "%s\\%s.wdt", CMap::s_mapPath, CMap::s_mapName);
// TODO // TODO
CMap::s_mapID = mapID;
// TODO
} }
void CMap::MapMemInitialize() { void CMap::MapMemInitialize() {

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

@ -23,6 +23,7 @@ class CMap {
static uint32_t* s_mapObjDefHeap; static uint32_t* s_mapObjDefHeap;
static uint32_t* s_mapObjGroupHeap; static uint32_t* s_mapObjGroupHeap;
static uint32_t* s_mapObjHeap; static uint32_t* s_mapObjHeap;
static int32_t s_mapID;
static char s_mapName[]; static char s_mapName[];
static char s_mapPath[]; static char s_mapPath[];
static char s_wdtFilename[]; static char s_wdtFilename[];
@ -30,7 +31,7 @@ class CMap {
// Static functions // Static functions
static CMapEntity* AllocEntity(int32_t a1); static CMapEntity* AllocEntity(int32_t a1);
static void Initialize(); static void Initialize();
static void Load(const char* mapName, int32_t zoneID); static void Load(const char* mapName, int32_t mapID);
static void MapMemInitialize(); static void MapMemInitialize();
}; };