mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-01-13 19:21:16 +00:00
Merge remote-tracking branch 'isle/master'
This commit is contained in:
commit
0a1516fbd9
@ -285,7 +285,7 @@ class LegoAnimationManager : public MxCore {
|
||||
MxLong m_unk0x410; // 0x410
|
||||
MxU32 m_unk0x414; // 0x414
|
||||
MxU32 m_numAllowedExtras; // 0x418
|
||||
undefined4 m_unk0x41c; // 0x41c
|
||||
MxU32 m_maxAllowedExtras; // 0x41c
|
||||
AnimState* m_animState; // 0x420
|
||||
LegoROIList* m_unk0x424; // 0x424
|
||||
MxBool m_suspendedEnableCamAnims; // 0x428
|
||||
|
||||
@ -503,7 +503,7 @@ void LegoAnimationManager::Init()
|
||||
m_unk0x1a = FALSE;
|
||||
m_tranInfoList = NULL;
|
||||
m_tranInfoList2 = NULL;
|
||||
m_unk0x41c = g_legoAnimationManagerConfig <= 1 ? 10 : 20;
|
||||
m_maxAllowedExtras = g_legoAnimationManagerConfig <= 1 ? 10 : 20;
|
||||
|
||||
MxS32 i;
|
||||
for (i = 0; i < (MxS32) sizeOfArray(m_unk0x28); i++) {
|
||||
@ -1576,7 +1576,7 @@ MxResult LegoAnimationManager::Tickle()
|
||||
if (elapsedSeconds > 0.2 && m_numAllowedExtras > 2) {
|
||||
m_numAllowedExtras--;
|
||||
}
|
||||
else if (g_unk0x100f7500 < 0.16 && m_numAllowedExtras < m_unk0x41c) {
|
||||
else if (g_unk0x100f7500 < 0.16 && m_numAllowedExtras < m_maxAllowedExtras) {
|
||||
m_numAllowedExtras++;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user