isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

style

Browse Source
This commit is contained in:
Christian Semmler 2024-04-06 11:32:35 -04:00
parent 59cd52f541
commit f71c13e9e3
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
View File

@ -252,39 +252,26 @@ void LegoCharacterManager::FUN_10083f10(LegoROI* p_roi)
LegoCharacter* character = (*it).second; LegoCharacter* character = (*it).second;
if (character->m_roi == p_roi) { if (character->m_roi == p_roi) {
if (character->RemoveRef() != 0) { if (character->RemoveRef() == 0) {
return; LegoEntity* entity = character->m_roi->GetEntity();
if (entity != NULL) {
entity->SetROI(NULL, FALSE, FALSE);
}
RemoveROI(character->m_roi);
delete[] const_cast<char*>((*it).first);
delete (*it).second;
m_characters->erase(it);
if (entity != NULL && entity->GetFlagsIsSet(LegoEntity::c_bit2)) {
entity->ClearFlag(LegoEntity::c_bit2);
delete entity;
}
} }
LegoEntity* entity = character->m_roi->GetEntity();
if (entity != NULL) {
entity->SetROI(NULL, FALSE, FALSE);
}
RemoveROI(character->m_roi);
delete[] const_cast<char*>((*it).first);
delete (*it).second;
m_characters->erase(it);
if (entity == NULL) {
return;
}
if (!entity->GetFlagsIsSet(LegoEntity::c_bit2)) {
return;
}
entity->ClearFlag(LegoEntity::c_bit2);
if (entity == NULL) {
return;
}
delete entity;
return; return;
} }
} }