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

Name/rename functions in LegoCharacterManager (#982)

Browse Source 
* Name/rename functions in LegoCharacterManager

* Name flag
This commit is contained in:
Christian Semmler
2024-06-01 12:45:34 -04:00
committed by GitHub
parent 375ac29b9b
commit 23e5ad7d15
16 changed files with 206 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View File

@@ -188,7 +188,7 @@ LegoChar* LegoAnimPresenter::FUN_10069150(const LegoChar* p_und1)
{
LegoChar* str;
if (LegoCharacterManager::Exists(p_und1 + 1)) {
if (LegoCharacterManager::IsActor(p_und1 + 1)) {
str = new LegoChar[strlen(p_und1)];
if (str != NULL) {
@@ -232,7 +232,7 @@ void LegoAnimPresenter::FUN_100692b0()
src = str;
}
roi = CharacterManager()->GetROI(src, TRUE);
roi = CharacterManager()->GetActorROI(src, TRUE);
if (roi != NULL && str[0] == '*') {
roi->SetVisibility(FALSE);
@@ -268,7 +268,7 @@ void LegoAnimPresenter::FUN_100692b0()
strlwr(lodName);
LegoChar* und = FUN_10069150(str);
roi = CharacterManager()->FUN_10085210(und, lodName, TRUE);
roi = CharacterManager()->CreateAutoROI(und, lodName, TRUE);
if (roi != NULL) {
roi->SetVisibility(FALSE);
@@ -313,7 +313,7 @@ void LegoAnimPresenter::FUN_100695c0()
strlwr(lodName);
CharacterManager()->FUN_10085210(actorName, lodName, FALSE);
CharacterManager()->CreateAutoROI(actorName, lodName, FALSE);
FUN_100698b0(rois, actorName);
}
}
@@ -530,8 +530,8 @@ void LegoAnimPresenter::FUN_1006aa60()
while (cursor.Next(roi)) {
const char* name = roi->GetName();
if (m_unk0x96 || !CharacterManager()->Exists(name)) {
CharacterManager()->FUN_10083c30(name);
if (m_unk0x96 || !CharacterManager()->IsActor(name)) {
CharacterManager()->ReleaseActor(name);
}
}
}

11
LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
View File

@@ -224,7 +224,7 @@ MxResult LegoModelPresenter::FUN_1007ff70(
if (p_entity != NULL) {
p_entity->SetROI(m_roi, TRUE, TRUE);
p_entity->ClearFlag(LegoEntity::c_bit2);
p_entity->ClearFlag(LegoEntity::c_managerOwned);
}
else {
p_world->GetROIList().push_back(m_roi);
@@ -249,9 +249,10 @@ void LegoModelPresenter::ReadyTickle()
((LegoEntityPresenter*) m_compositePresenter)
->GetInternalEntity()
->SetFlags(
((LegoEntityPresenter*) m_compositePresenter)->GetInternalEntity()->GetFlags() & ~LegoEntity::c_bit2
((LegoEntityPresenter*) m_compositePresenter)->GetInternalEntity()->GetFlags() &
~LegoEntity::c_managerOwned
);
((LegoEntityPresenter*) m_compositePresenter)->GetInternalEntity()->SetType(LegoEntity::e_character);
((LegoEntityPresenter*) m_compositePresenter)->GetInternalEntity()->SetType(LegoEntity::e_actor);
}
ParseExtra();
@@ -276,7 +277,7 @@ void LegoModelPresenter::ReadyTickle()
->GetInternalEntity()
->SetFlags(
((LegoEntityPresenter*) m_compositePresenter)->GetInternalEntity()->GetFlags() &
~LegoEntity::c_bit2
~LegoEntity::c_managerOwned
);
}
@@ -306,7 +307,7 @@ void LegoModelPresenter::ParseExtra()
char* token = strtok(output, g_parseExtraTokens);
if (m_roi == NULL) {
m_roi = CharacterManager()->GetROI(token, FALSE);
m_roi = CharacterManager()->GetActorROI(token, FALSE);
m_addedToView = FALSE;
}
}

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

@@ -52,7 +52,7 @@ void LegoPhonemePresenter::StartingTickle()
m_unk0x84 = TRUE;
}
else {
entityROI = CharacterManager()->GetROI(m_roiName.GetData(), TRUE);
entityROI = CharacterManager()->GetActorROI(m_roiName.GetData(), TRUE);
}
head = entityROI->FindChildROI("head", entityROI);
@@ -143,7 +143,7 @@ void LegoPhonemePresenter::EndAction()
roi = FindROI(m_roiName.GetData());
}
else {
roi = CharacterManager()->GetROI(m_roiName.GetData(), TRUE);
roi = CharacterManager()->GetActorROI(m_roiName.GetData(), TRUE);
}
if (roi != NULL) {
@@ -151,7 +151,7 @@ void LegoPhonemePresenter::EndAction()
}
if (!m_unk0x84) {
CharacterManager()->FUN_10083c30(m_roiName.GetData());
CharacterManager()->ReleaseActor(m_roiName.GetData());
}
TextureContainer()->EraseCached(phoneme->VTable0x10());
@@ -164,7 +164,7 @@ void LegoPhonemePresenter::EndAction()
}
if (!m_unk0x84) {
CharacterManager()->FUN_10083c30(m_roiName.GetData());
CharacterManager()->ReleaseActor(m_roiName.GetData());
}
}
}