From 12b8de0ec8e4ce383466b95ca88952529b51d833 Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Thu, 27 May 2021 17:24:08 -0400
Subject: [PATCH] Rename worldLayers -> m_worldLayers

---
 Runtime/ImGuiConsole.cpp | 2 +-
 Runtime/World/CWorld.cpp | 4 ++--
 Runtime/World/CWorld.hpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Runtime/ImGuiConsole.cpp b/Runtime/ImGuiConsole.cpp
index c16510a93..e268b53a5 100644
--- a/Runtime/ImGuiConsole.cpp
+++ b/Runtime/ImGuiConsole.cpp
@@ -790,7 +790,7 @@ void ImGuiConsole::ShowLayersWindow() {
       if (!layers) {
         continue;
       }
-      
+
       if (ImGui::TreeNode(world.first.c_str())) {
         auto worldLayerState = g_GameState->StateForWorld(world.second).GetLayerState();
         u32 startNameIdx = 0;
diff --git a/Runtime/World/CWorld.cpp b/Runtime/World/CWorld.cpp
index 03f1c47f2..bbeff746e 100644
--- a/Runtime/World/CWorld.cpp
+++ b/Runtime/World/CWorld.cpp
@@ -150,7 +150,7 @@ bool CDummyWorld::ICheckWorldComplete() {
     if (version > 12)
       r.readString();
 
-    worldLayers = CWorldLayers::ReadWorldLayers(r, version, xc_mlvlId);
+    m_worldLayers = CWorldLayers::ReadWorldLayers(r, version, xc_mlvlId);
 
     x30_loadToken.reset();
     x34_loadBuf.reset();
@@ -190,7 +190,7 @@ std::string CDummyWorld::IGetDefaultAudioTrack() const { return {}; }
 
 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)
 : x8_mlvlId(mlvlId)
diff --git a/Runtime/World/CWorld.hpp b/Runtime/World/CWorld.hpp
index bc12e1b81..de730173e 100644
--- a/Runtime/World/CWorld.hpp
+++ b/Runtime/World/CWorld.hpp
@@ -69,7 +69,7 @@ class CDummyWorld : public IWorld {
   u32 x38_bufSz;
   TAreaId x3c_curAreaId = kInvalidAreaId;
 
-  std::optional<CWorldLayers> worldLayers;
+  std::optional<CWorldLayers> m_worldLayers;
 
 public:
   CDummyWorld(CAssetId mlvlId, bool loadMap);