AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 01:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Rename CWorldLayerState to CScriptLayerManager (this is it's actual name)

Browse Source
This commit is contained in:
Phillip Stephens
2021-06-03 23:08:05 -07:00
parent 99d363d5df
commit 144af8cc15
13 changed files with 74 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/CGameState.hpp
View File

@@ -17,14 +17,14 @@
namespace metaforce {
class CSaveWorldMemory;
class CWorldLayerState {
class CScriptLayerManager {
friend class CSaveWorldIntermediate;
std::vector<CWorldLayers::Area> x0_areaLayers;
DataSpec::WordBitmap x10_saveLayers;
public:
CWorldLayerState() = default;
CWorldLayerState(CBitStreamReader& reader, const CSaveWorld& saveWorld);
CScriptLayerManager() = default;
CScriptLayerManager(CBitStreamReader& reader, const CSaveWorld& saveWorld);
bool IsLayerActive(int areaIdx, int layerIdx) const { return ((x0_areaLayers[areaIdx].m_layerBits >> layerIdx) & 1); }
@@ -46,10 +46,10 @@ public:
class CWorldState {
CAssetId x0_mlvlId;
TAreaId x4_areaId = kInvalidAreaId;
std::shared_ptr<CScriptMailbox> x8_relayTracker;
std::shared_ptr<CScriptMailbox> x8_mailbox;
std::shared_ptr<CMapWorldInfo> xc_mapWorldInfo;
CAssetId x10_desiredAreaAssetId;
std::shared_ptr<CWorldLayerState> x14_layerState;
std::shared_ptr<CScriptLayerManager> x14_layerState;
public:
explicit CWorldState(CAssetId id);
@@ -59,9 +59,9 @@ public:
TAreaId GetCurrentAreaId() const { return x4_areaId; }
CAssetId GetDesiredAreaAssetId() const { return x10_desiredAreaAssetId; }
void SetDesiredAreaAssetId(CAssetId id) { x10_desiredAreaAssetId = id; }
const std::shared_ptr<CScriptMailbox>& RelayTracker() const { return x8_relayTracker; }
const std::shared_ptr<CScriptMailbox>& Mailbox() const { return x8_mailbox; }
const std::shared_ptr<CMapWorldInfo>& MapWorldInfo() const { return xc_mapWorldInfo; }
const std::shared_ptr<CWorldLayerState>& GetLayerState() const { return x14_layerState; }
const std::shared_ptr<CScriptLayerManager>& GetLayerState() const { return x14_layerState; }
void PutTo(CBitStreamWriter& writer, const CSaveWorld& savw) const;
};