mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear unknowns in LegoPhonemePresenter (#1632)

Browse Source
This commit is contained in:
Fabian Neundorf
2025-07-18 23:26:34 +02:00
committed by GitHub
parent 66844aa945
commit cfd36ec88f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legophonemepresenter.h
View File

@@ -42,9 +42,9 @@ private:
MxS32 m_rectCount; // 0x68 MxS32 m_rectCount; // 0x68
LegoTextureInfo* m_textureInfo; // 0x6c LegoTextureInfo* m_textureInfo; // 0x6c
MxBool m_unk0x70; // 0x70 MxBool m_reusedPhoneme; // 0x70
MxString m_roiName; // 0x74 MxString m_roiName; // 0x74
MxBool m_unk0x84; // 0x84 MxBool m_isPartOfAnimMM; // 0x84
}; };
// TEMPLATE: LEGO1 0x1004eb20 // TEMPLATE: LEGO1 0x1004eb20

14
LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
View File

@@ -25,8 +25,8 @@ void LegoPhonemePresenter::Init()
{ {
m_rectCount = 0; m_rectCount = 0;
m_textureInfo = NULL; m_textureInfo = NULL;
m_unk0x70 = FALSE; m_reusedPhoneme = FALSE;
m_unk0x84 = FALSE; m_isPartOfAnimMM = FALSE;
} }
// FUNCTION: LEGO1 0x1004e3d0 // FUNCTION: LEGO1 0x1004e3d0
@@ -49,7 +49,7 @@ void LegoPhonemePresenter::StartingTickle()
if (m_compositePresenter != NULL && m_compositePresenter->IsA("LegoAnimMMPresenter")) { if (m_compositePresenter != NULL && m_compositePresenter->IsA("LegoAnimMMPresenter")) {
entityROI = FindROI(m_roiName.GetData()); entityROI = FindROI(m_roiName.GetData());
m_unk0x84 = TRUE; m_isPartOfAnimMM = TRUE;
} }
else { else {
entityROI = CharacterManager()->GetActorROI(m_roiName.GetData(), TRUE); entityROI = CharacterManager()->GetActorROI(m_roiName.GetData(), TRUE);
@@ -81,7 +81,7 @@ void LegoPhonemePresenter::StartingTickle()
phoneme->SetCount(phoneme->GetCount() + 1); phoneme->SetCount(phoneme->GetCount() + 1);
cursor.SetValue(phoneme); cursor.SetValue(phoneme);
m_unk0x70 = TRUE; m_reusedPhoneme = TRUE;
} }
} }
} }
@@ -139,7 +139,7 @@ void LegoPhonemePresenter::EndAction()
if (phoneme->GetCount() == 1) { if (phoneme->GetCount() == 1) {
LegoROI* roi; LegoROI* roi;
if (m_unk0x84) { if (m_isPartOfAnimMM) {
roi = FindROI(m_roiName.GetData()); roi = FindROI(m_roiName.GetData());
} }
else { else {
@@ -150,7 +150,7 @@ void LegoPhonemePresenter::EndAction()
CharacterManager()->SetHeadTexture(roi, NULL); CharacterManager()->SetHeadTexture(roi, NULL);
} }
if (!m_unk0x84) { if (!m_isPartOfAnimMM) {
CharacterManager()->ReleaseActor(m_roiName.GetData()); CharacterManager()->ReleaseActor(m_roiName.GetData());
} }
@@ -163,7 +163,7 @@ void LegoPhonemePresenter::EndAction()
cursor.SetValue(phoneme); cursor.SetValue(phoneme);
} }
if (!m_unk0x84) { if (!m_isPartOfAnimMM) {
CharacterManager()->ReleaseActor(m_roiName.GetData()); CharacterManager()->ReleaseActor(m_roiName.GetData());
} }
} }