AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename worldLayers -> m_worldLayers

This commit is contained in:
Luke Street 2021-05-27 17:24:08 -04:00
parent 6fb20ab703
commit 12b8de0ec8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/ImGuiConsole.cpp
View File

@ -790,7 +790,7 @@ void ImGuiConsole::ShowLayersWindow() {
if (!layers) { if (!layers) {
continue; continue;
} }
if (ImGui::TreeNode(world.first.c_str())) { if (ImGui::TreeNode(world.first.c_str())) {
auto worldLayerState = g_GameState->StateForWorld(world.second).GetLayerState(); auto worldLayerState = g_GameState->StateForWorld(world.second).GetLayerState();
u32 startNameIdx = 0; u32 startNameIdx = 0;

4
Runtime/World/CWorld.cpp
View File

@ -150,7 +150,7 @@ bool CDummyWorld::ICheckWorldComplete() {
if (version > 12) if (version > 12)
r.readString(); r.readString();
worldLayers = CWorldLayers::ReadWorldLayers(r, version, xc_mlvlId); m_worldLayers = CWorldLayers::ReadWorldLayers(r, version, xc_mlvlId);
x30_loadToken.reset(); x30_loadToken.reset();
x34_loadBuf.reset(); x34_loadBuf.reset();
@ -190,7 +190,7 @@ std::string CDummyWorld::IGetDefaultAudioTrack() const { return {}; }
int CDummyWorld::IGetAreaCount() const { return x18_areas.size(); } int CDummyWorld::IGetAreaCount() const { return x18_areas.size(); }
const std::optional<CWorldLayers>& CDummyWorld::GetWorldLayers() const { return worldLayers; } const std::optional<CWorldLayers>& CDummyWorld::GetWorldLayers() const { return m_worldLayers; }
CWorld::CWorld(IObjectStore& objStore, IFactory& resFactory, CAssetId mlvlId) CWorld::CWorld(IObjectStore& objStore, IFactory& resFactory, CAssetId mlvlId)
: x8_mlvlId(mlvlId) : x8_mlvlId(mlvlId)

2
Runtime/World/CWorld.hpp
View File

@ -69,7 +69,7 @@ class CDummyWorld : public IWorld {
u32 x38_bufSz; u32 x38_bufSz;
TAreaId x3c_curAreaId = kInvalidAreaId; TAreaId x3c_curAreaId = kInvalidAreaId;
std::optional<CWorldLayers> worldLayers; std::optional<CWorldLayers> m_worldLayers;
public: public:
CDummyWorld(CAssetId mlvlId, bool loadMap); CDummyWorld(CAssetId mlvlId, bool loadMap);