isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-26 01:28:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

implement/match LegoAnimationManager::FindVehicle() (#748)

Browse source
This commit is contained in:
Ramen2X 2024-03-29 11:50:16 -04:00 committed by GitHub
parent bfc2b76a61
commit 7431d9d650
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legoanimationmanager.h
View file

@ -67,7 +67,7 @@ class LegoAnimationManager : public MxCore {
void FUN_1005f6d0(MxBool); void FUN_1005f6d0(MxBool);
void FUN_1005f700(MxBool); void FUN_1005f700(MxBool);
MxResult LoadScriptInfo(MxS32 p_scriptIndex); MxResult LoadScriptInfo(MxS32 p_scriptIndex);
MxBool FUN_10060140(char* p_name, MxU32& p_index); MxBool FindVehicle(const char* p_name, MxU32& p_index);
MxResult ReadAnimInfo(LegoFile* p_file, AnimInfo* p_info); MxResult ReadAnimInfo(LegoFile* p_file, AnimInfo* p_info);
MxResult ReadModelInfo(LegoFile* p_file, ModelInfo* p_info); MxResult ReadModelInfo(LegoFile* p_file, ModelInfo* p_info);
void FUN_100603c0(); void FUN_100603c0();

14
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View file

@ -254,7 +254,7 @@ MxResult LegoAnimationManager::LoadScriptInfo(MxS32 p_scriptIndex)
for (MxS32 m = 0; m < m_anims[j].m_modelCount; m++) { for (MxS32 m = 0; m < m_anims[j].m_modelCount; m++) {
MxU32 n; MxU32 n;
if (FUN_10060140(m_anims[j].m_models[m].m_modelName, n) && m_anims[j].m_models[m].m_unk0x2c) { if (FindVehicle(m_anims[j].m_models[m].m_modelName, n) && m_anims[j].m_models[m].m_unk0x2c) {
m_anims[j].m_unk0x2a[count++] = n; m_anims[j].m_unk0x2a[count++] = n;
if (count > 3) { if (count > 3) {
break; break;
@ -294,10 +294,16 @@ MxResult LegoAnimationManager::LoadScriptInfo(MxS32 p_scriptIndex)
return result; return result;
} }
// STUB: LEGO1 0x10060140 // FUNCTION: LEGO1 0x10060140
MxBool LegoAnimationManager::FUN_10060140(char* p_name, MxU32& p_index) MxBool LegoAnimationManager::FindVehicle(const char* p_name, MxU32& p_index)
{ {
// TODO for (MxS32 i = 0; i < _countof(g_vehicles); i++) {
if (!strcmpi(p_name, g_vehicles[i].m_name)) {
p_index = i;
return TRUE;
}
}
return FALSE; return FALSE;
} }