diff --git a/LEGO1/lego/legoomni/include/legomain.h b/LEGO1/lego/legoomni/include/legomain.h index 8efa402b..eee96fb5 100644 --- a/LEGO1/lego/legoomni/include/legomain.h +++ b/LEGO1/lego/legoomni/include/legomain.h @@ -111,8 +111,8 @@ class LegoOmni : public MxOmni { void CreateBackgroundAudio(); void RemoveWorld(const MxAtomId& p_atom, MxLong p_objectId); MxResult RegisterWorlds(); - const char* GetScriptName(MxU32 p_index); - MxAtomId* GetScriptAtom(MxU32 p_index); + const char* GetWorldName(MxU32 p_id); + MxAtomId* GetWorldAtom(MxU32 p_id); MxS32 GetWorldId(const char* p_key); void DeleteAction(); diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index 7514dcbf..ab48daef 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -629,7 +629,7 @@ MxResult LegoAnimationManager::LoadWorldInfo(MxS32 p_worldId) char filename[128]; char path[1024]; - sprintf(filename, "lego\\data\\%sinf.dta", Lego()->GetScriptName(p_worldId)); + sprintf(filename, "lego\\data\\%sinf.dta", Lego()->GetWorldName(p_worldId)); sprintf(path, "%s", MxOmni::GetHD()); if (path[strlen(path) - 1] != '\\') { @@ -983,7 +983,7 @@ MxResult LegoAnimationManager::FUN_100605e0( char buf[256]; sprintf(buf, "%s:%d", g_strANIMMAN_ID, tranInfo->m_index); - action.SetAtomId(*Lego()->GetScriptAtom(m_worldId)); + action.SetAtomId(*Lego()->GetWorldAtom(m_worldId)); action.SetObjectId(animInfo.m_objectId); action.SetUnknown24(-1); action.AppendExtra(strlen(buf) + 1, buf); @@ -1050,7 +1050,7 @@ MxResult LegoAnimationManager::FUN_100609f0(MxU32 p_objectId, MxMatrix* p_matrix char buf[256]; sprintf(buf, "%s:%d", g_strANIMMAN_ID, info->m_index); - action.SetAtomId(*Lego()->GetScriptAtom(m_worldId)); + action.SetAtomId(*Lego()->GetWorldAtom(m_worldId)); action.SetObjectId(p_objectId); action.SetUnknown24(-1); action.AppendExtra(strlen(buf) + 1, buf); diff --git a/LEGO1/lego/legoomni/src/main/legomain.cpp b/LEGO1/lego/legoomni/src/main/legomain.cpp index 29796d37..62a927ff 100644 --- a/LEGO1/lego/legoomni/src/main/legomain.cpp +++ b/LEGO1/lego/legoomni/src/main/legomain.cpp @@ -474,10 +474,10 @@ MxS32 LegoOmni::GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value) } // FUNCTION: LEGO1 0x1005b430 -const char* LegoOmni::GetScriptName(MxU32 p_index) +const char* LegoOmni::GetWorldName(MxU32 p_id) { for (MxS32 i = 0; i < 19; i++) { - if (m_worlds[i].m_id == p_index) { + if (m_worlds[i].m_id == p_id) { return m_worlds[i].m_key; } } @@ -486,10 +486,10 @@ const char* LegoOmni::GetScriptName(MxU32 p_index) } // FUNCTION: LEGO1 0x1005b460 -MxAtomId* LegoOmni::GetScriptAtom(MxU32 p_index) +MxAtomId* LegoOmni::GetWorldAtom(MxU32 p_id) { for (MxS32 i = 0; i < 19; i++) { - if (m_worlds[i].m_id == p_index) { + if (m_worlds[i].m_id == p_id) { return m_worlds[i].m_atomId; } }