mirror of https://github.com/AxioDL/metaforce.git
CWorld: Separate enum definition from declaration
Allows more flexibility if anything ever gets moved around and is arguably nicer to read.
This commit is contained in:
parent
515103aa92
commit
01bb0f3840
|
@ -38,13 +38,15 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
class CDummyWorld : public IWorld {
|
class CDummyWorld : public IWorld {
|
||||||
bool x4_loadMap;
|
|
||||||
enum class Phase {
|
enum class Phase {
|
||||||
Loading,
|
Loading,
|
||||||
LoadingMap,
|
LoadingMap,
|
||||||
LoadingMapAreas,
|
LoadingMapAreas,
|
||||||
Done,
|
Done,
|
||||||
} x8_phase = Phase::Loading;
|
};
|
||||||
|
|
||||||
|
bool x4_loadMap;
|
||||||
|
Phase x8_phase = Phase::Loading;
|
||||||
CAssetId xc_mlvlId;
|
CAssetId xc_mlvlId;
|
||||||
CAssetId x10_strgId;
|
CAssetId x10_strgId;
|
||||||
CAssetId x14_savwId;
|
CAssetId x14_savwId;
|
||||||
|
@ -112,7 +114,9 @@ private:
|
||||||
LoadingSkyBox,
|
LoadingSkyBox,
|
||||||
LoadingSoundGroups,
|
LoadingSoundGroups,
|
||||||
Done,
|
Done,
|
||||||
} x4_phase = Phase::Loading;
|
};
|
||||||
|
|
||||||
|
Phase x4_phase = Phase::Loading;
|
||||||
CAssetId x8_mlvlId;
|
CAssetId x8_mlvlId;
|
||||||
CAssetId xc_strgId;
|
CAssetId xc_strgId;
|
||||||
CAssetId x10_savwId;
|
CAssetId x10_savwId;
|
||||||
|
|
Loading…
Reference in New Issue