diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h index 782dccb9..ff627646 100644 --- a/LEGO1/lego/legoomni/include/legobuildingmanager.h +++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h @@ -66,7 +66,7 @@ class LegoBuildingManager : public MxCore { static void SetCustomizeAnimFile(const char* p_value); void Init(); - void FUN_1002fa00(); + void LoadWorldInfo(); void CreateBuilding(MxS32 p_index, LegoWorld* p_world); void Reset(); MxResult Write(LegoStorage* p_storage); diff --git a/LEGO1/lego/legoomni/include/legoplants.h b/LEGO1/lego/legoomni/include/legoplants.h index ee1ea49b..1b26b0e8 100644 --- a/LEGO1/lego/legoomni/include/legoplants.h +++ b/LEGO1/lego/legoomni/include/legoplants.h @@ -10,7 +10,7 @@ class LegoPathBoundary; // SIZE 0x54 struct LegoPlantInfo { // See LegoOmni::RegisterWorlds for IDs - enum Worlds { + enum World { c_act1 = 1 << 0, c_imain = 1 << 1, c_ielev = 1 << 4, diff --git a/LEGO1/lego/legoomni/src/common/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/common/legobuildingmanager.cpp index 00cfa8dc..b69a3f52 100644 --- a/LEGO1/lego/legoomni/src/common/legobuildingmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legobuildingmanager.cpp @@ -257,7 +257,7 @@ void LegoBuildingManager::Init() // FUNCTION: LEGO1 0x1002fa00 // FUNCTION: BETA10 0x10063ad1 -void LegoBuildingManager::FUN_1002fa00() +void LegoBuildingManager::LoadWorldInfo() { MxS32 i; LegoWorld* world = CurrentWorld(); diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index de9c3c63..b7fd9aab 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -694,7 +694,7 @@ void LegoWorld::Enable(MxBool p_enable) if (m_worldId != -1) { PlantManager()->LoadWorldInfo(m_worldId); AnimationManager()->LoadWorldInfo(m_worldId); - BuildingManager()->FUN_1002fa00(); + BuildingManager()->LoadWorldInfo(); AnimationManager()->Resume(); } diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp index 37488092..070f05e6 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp @@ -57,7 +57,7 @@ LegoWorldPresenter::~LegoWorldPresenter() MxS32 worldId = ((LegoWorld*) m_entity)->GetWorldId(); PlantManager()->LoadWorldInfo(worldId); AnimationManager()->LoadWorldInfo(worldId); - BuildingManager()->FUN_1002fa00(); + BuildingManager()->LoadWorldInfo(); result = ((LegoWorld*) m_entity)->VTable0x5c(); }