diff --git a/LEGO1/lego/legoomni/include/legocharactermanager.h b/LEGO1/lego/legoomni/include/legocharactermanager.h index 7eee1243..bc385091 100644 --- a/LEGO1/lego/legoomni/include/legocharactermanager.h +++ b/LEGO1/lego/legoomni/include/legocharactermanager.h @@ -58,8 +58,8 @@ class LegoCharacterManager { LegoCharacterData* GetData(LegoROI* p_roi); MxBool FUN_10084ec0(LegoROI* p_roi); MxU32 FUN_10085140(LegoROI* p_roi, MxBool p_und); - LegoROI* FUN_10085210(const char* p_name, const char* p_roiName, MxBool p_createEntity); - LegoROI* FUN_10085a80(const char* p_name, const char* p_roiName, MxBool p_createEntity); + LegoROI* FUN_10085210(const char* p_name, const char* p_lodName, MxBool p_createEntity); + LegoROI* FUN_10085a80(const char* p_name, const char* p_lodName, MxBool p_createEntity); static const char* GetCustomizeAnimFile() { return g_customizeAnimFile; } diff --git a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp index 1ee0441b..f4a23eec 100644 --- a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp @@ -495,7 +495,7 @@ void LegoCharacterManager::SetCustomizeAnimFile(const char* p_value) } // FUNCTION: LEGO1 0x10085210 -LegoROI* LegoCharacterManager::FUN_10085210(const char* p_name, const char* p_roiName, MxBool p_createEntity) +LegoROI* LegoCharacterManager::FUN_10085210(const char* p_name, const char* p_lodName, MxBool p_createEntity) { LegoROI* roi = NULL; @@ -503,7 +503,7 @@ LegoROI* LegoCharacterManager::FUN_10085210(const char* p_name, const char* p_ro Tgl::Renderer* renderer = VideoManager()->GetRenderer(); ViewLODListManager* lodManager = GetViewLODListManager(); LegoTextureContainer* textureContainer = TextureContainer(); - ViewLODList* lodList = lodManager->Lookup(p_roiName); + ViewLODList* lodList = lodManager->Lookup(p_lodName); if (lodList == NULL || lodList->Size() == 0) { return NULL; @@ -562,7 +562,7 @@ MxResult LegoCharacterManager::FUN_10085870(LegoROI* p_roi) } // FUNCTION: LEGO1 0x10085a80 -LegoROI* LegoCharacterManager::FUN_10085a80(const char* p_name, const char* p_roiName, MxBool p_createEntity) +LegoROI* LegoCharacterManager::FUN_10085a80(const char* p_name, const char* p_lodName, MxBool p_createEntity) { - return FUN_10085210(p_name, p_roiName, p_createEntity); + return FUN_10085210(p_name, p_lodName, p_createEntity); } diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp index e815feef..95bd4c8c 100644 --- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp @@ -166,25 +166,25 @@ void LegoAnimPresenter::FUN_100692b0() } } else if (unk0x04 == 4) { - LegoChar* src = new LegoChar[strlen(str)]; - strcpy(src, str + 1); - strlwr(src); + LegoChar* baseName = new LegoChar[strlen(str)]; + strcpy(baseName, str + 1); + strlwr(baseName); LegoChar* und = FUN_10069150(str); - roi = CharacterManager()->FUN_10085a80(und, src, TRUE); + roi = CharacterManager()->FUN_10085a80(und, baseName, TRUE); if (roi != NULL) { roi->SetVisibility(FALSE); } - delete[] src; + delete[] baseName; delete[] und; } else if (unk0x04 == 3) { - LegoChar* src = new LegoChar[strlen(str)]; - strcpy(src, str + 1); + LegoChar* lodName = new LegoChar[strlen(str)]; + strcpy(lodName, str + 1); - for (LegoChar* i = &src[strlen(src) - 1]; i > src; i--) { + for (LegoChar* i = &lodName[strlen(lodName) - 1]; i > lodName; i--) { if ((*i < '0' || *i > '9') && *i != '_') { break; } @@ -192,16 +192,16 @@ void LegoAnimPresenter::FUN_100692b0() *i = '\0'; } - strlwr(src); + strlwr(lodName); LegoChar* und = FUN_10069150(str); - roi = CharacterManager()->FUN_10085210(und, src, TRUE); + roi = CharacterManager()->FUN_10085210(und, lodName, TRUE); if (roi != NULL) { roi->SetVisibility(FALSE); } - delete[] src; + delete[] lodName; delete[] und; } @@ -228,20 +228,20 @@ void LegoAnimPresenter::FUN_100695c0() undefined4 unk0x04 = m_anim->GetActorUnknown0x04(i); if (unk0x04 == 5 || unk0x04 == 6) { - LegoChar dest[256]; - const LegoChar* str = m_anim->GetActorName(i); + LegoChar lodName[256]; + const LegoChar* actorName = m_anim->GetActorName(i); - LegoU32 len = strlen(str); - strcpy(dest, str); + LegoU32 len = strlen(actorName); + strcpy(lodName, actorName); - for (LegoChar* i = &dest[len - 1]; isdigit(*i) || *i == '_'; i--) { + for (LegoChar* i = &lodName[len - 1]; isdigit(*i) || *i == '_'; i--) { *i = '\0'; } - strlwr(dest); + strlwr(lodName); - CharacterManager()->FUN_10085210(str, dest, FALSE); - FUN_100698b0(rois, str); + CharacterManager()->FUN_10085210(actorName, lodName, FALSE); + FUN_100698b0(rois, actorName); } } }