From 01bb0f38403dd672e4c8fe8acd0ea7f184736194 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 11 Apr 2020 15:28:58 -0400 Subject: [PATCH] CWorld: Separate enum definition from declaration Allows more flexibility if anything ever gets moved around and is arguably nicer to read. --- Runtime/World/CWorld.hpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Runtime/World/CWorld.hpp b/Runtime/World/CWorld.hpp index 17e815ff4..87c6f31b8 100644 --- a/Runtime/World/CWorld.hpp +++ b/Runtime/World/CWorld.hpp @@ -38,13 +38,15 @@ public: }; class CDummyWorld : public IWorld { - bool x4_loadMap; enum class Phase { Loading, LoadingMap, LoadingMapAreas, Done, - } x8_phase = Phase::Loading; + }; + + bool x4_loadMap; + Phase x8_phase = Phase::Loading; CAssetId xc_mlvlId; CAssetId x10_strgId; CAssetId x14_savwId; @@ -112,7 +114,9 @@ private: LoadingSkyBox, LoadingSoundGroups, Done, - } x4_phase = Phase::Loading; + }; + + Phase x4_phase = Phase::Loading; CAssetId x8_mlvlId; CAssetId xc_strgId; CAssetId x10_savwId;