Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-12-23 05:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor CheckValidity

Browse Source 
- Change variables names to make it clear they are referring to the target
- Change how the target is decided to be an enemy of friend to use the built-in method
This commit is contained in:
CodeAX2 2022-01-02 14:01:29 -07:00
parent 9f895205d4
commit d78b2404e2
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dGame/dComponents/DestroyableComponent.cpp
View File

@ -500,27 +500,26 @@ Entity* DestroyableComponent::GetKiller() const
bool DestroyableComponent::CheckValidity(const LWOOBJID target, const bool ignoreFactions, const bool targetEnemy, const bool targetFriend) const bool DestroyableComponent::CheckValidity(const LWOOBJID target, const bool ignoreFactions, const bool targetEnemy, const bool targetFriend) const
{ {
auto* entity = EntityManager::Instance()->GetEntity(target); auto* targetEntity = EntityManager::Instance()->GetEntity(target);
if (entity == nullptr) if (targetEntity == nullptr)
{ {
Game::logger->Log("DestroyableComponent", "Invalid entity for checking validity (%llu)!\n", target); Game::logger->Log("DestroyableComponent", "Invalid entity for checking validity (%llu)!\n", target);
return false; return false;
} }
auto* destroyable = entity->GetComponent<DestroyableComponent>(); auto* targetDestroyable = targetEntity->GetComponent<DestroyableComponent>();
if (destroyable == nullptr) if (targetDestroyable == nullptr)
{ {
return false; return false;
} }
auto* quickbuild = entity->GetComponent<RebuildComponent>(); auto* targetQuickbuild = targetEntity->GetComponent<RebuildComponent>();
if (quickbuild != nullptr) if (targetQuickbuild != nullptr)
{ {
const auto state = quickbuild->GetState(); const auto state = targetQuickbuild->GetState();
if (state != REBUILD_COMPLETED) if (state != REBUILD_COMPLETED)
{ {
@ -533,22 +532,11 @@ bool DestroyableComponent::CheckValidity(const LWOOBJID target, const bool ignor
return true; return true;
} }
auto enemyList = GetEnemyFactionsIDs(); // Get if the target entity is an enemy
bool isEnemy = IsEnemy(targetEntity);
auto candidateList = destroyable->GetFactionIDs();
bool isEnemy = false;
for (auto value : candidateList)
{
if (std::find(enemyList.begin(), enemyList.end(), value) != enemyList.end())
{
isEnemy = true;
break;
}
}
// Return true if the target type matches what we are targeting
// Friends are entities who are not enemies
return (isEnemy && targetEnemy) || (!isEnemy && targetFriend); return (isEnemy && targetEnemy) || (!isEnemy && targetFriend);
} }