From b5dd5d5f481e16a342e6c732a66d1da161936f11 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 1 Jun 2024 12:35:40 -0400 Subject: [PATCH] Name flag --- LEGO1/lego/legoomni/include/legoentity.h | 2 +- .../src/common/legocharactermanager.cpp | 20 +++++++++---------- LEGO1/lego/legoomni/src/entity/legoworld.cpp | 2 +- .../legoomni/src/video/legomodelpresenter.cpp | 7 ++++--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h index c26c33d1..5fcced29 100644 --- a/LEGO1/lego/legoomni/include/legoentity.h +++ b/LEGO1/lego/legoomni/include/legoentity.h @@ -23,7 +23,7 @@ class LegoEntity : public MxEntity { enum { c_bit1 = 0x01, - c_bit2 = 0x02 + c_managerOwned = 0x02 }; enum { diff --git a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp index 61c106ed..dc48d9b5 100644 --- a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp @@ -255,7 +255,7 @@ LegoROI* LegoCharacterManager::GetActorROI(const char* p_name, MxBool p_createEn actor->SetROI(character->m_roi, FALSE, FALSE); actor->SetType(LegoEntity::e_actor); - actor->SetFlag(LegoEntity::c_bit2); + actor->SetFlag(LegoEntity::c_managerOwned); GetActorInfo(p_name)->m_actor = actor; } @@ -323,11 +323,11 @@ void LegoCharacterManager::ReleaseActor(const char* p_name) if (info != NULL) { if (info->m_actor != NULL) { - info->m_actor->ClearFlag(LegoEntity::c_bit2); + info->m_actor->ClearFlag(LegoEntity::c_managerOwned); delete info->m_actor; } - else if (entity != NULL && entity->GetFlagsIsSet(LegoEntity::c_bit2)) { - entity->ClearFlag(LegoEntity::c_bit2); + else if (entity != NULL && entity->GetFlagsIsSet(LegoEntity::c_managerOwned)) { + entity->ClearFlag(LegoEntity::c_managerOwned); delete entity; } @@ -365,11 +365,11 @@ void LegoCharacterManager::ReleaseActor(LegoROI* p_roi) if (info != NULL) { if (info->m_actor != NULL) { - info->m_actor->ClearFlag(LegoEntity::c_bit2); + info->m_actor->ClearFlag(LegoEntity::c_managerOwned); delete info->m_actor; } - else if (entity != NULL && entity->GetFlagsIsSet(LegoEntity::c_bit2)) { - entity->ClearFlag(LegoEntity::c_bit2); + else if (entity != NULL && entity->GetFlagsIsSet(LegoEntity::c_managerOwned)) { + entity->ClearFlag(LegoEntity::c_managerOwned); delete entity; } @@ -407,8 +407,8 @@ void LegoCharacterManager::ReleaseAutoROI(LegoROI* p_roi) m_characters->erase(it); - if (entity != NULL && entity->GetFlagsIsSet(LegoEntity::c_bit2)) { - entity->ClearFlag(LegoEntity::c_bit2); + if (entity != NULL && entity->GetFlagsIsSet(LegoEntity::c_managerOwned)) { + entity->ClearFlag(LegoEntity::c_managerOwned); delete entity; } } @@ -853,7 +853,7 @@ LegoROI* LegoCharacterManager::CreateAutoROI(const char* p_name, const char* p_l entity->SetROI(roi, FALSE, FALSE); entity->SetType(LegoEntity::e_autoROI); - entity->SetFlag(LegoEntity::c_bit2); + entity->SetFlag(LegoEntity::c_managerOwned); } } } diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index 71ffefae..9da873e0 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -187,7 +187,7 @@ void LegoWorld::Destroy(MxBool p_fromDestructor) while (cursor.First(entity)) { cursor.Detach(); - if (!(entity->GetFlags() & LegoEntity::c_bit2)) { + if (!(entity->GetFlags() & LegoEntity::c_managerOwned)) { delete entity; } } diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp index 9979d1c4..4a2cf715 100644 --- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp @@ -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,7 +249,8 @@ 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_actor); } @@ -276,7 +277,7 @@ void LegoModelPresenter::ReadyTickle() ->GetInternalEntity() ->SetFlags( ((LegoEntityPresenter*) m_compositePresenter)->GetInternalEntity()->GetFlags() & - ~LegoEntity::c_bit2 + ~LegoEntity::c_managerOwned ); }