Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-12-09 09:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Organize Entity header

Browse Source 
Probably the third or fourth pass of this darn header...  Just keep making it better every time
Rename some functions to make more sense to a reader
Use different method for Observing/subscribing to component events
Get rid of abomination of overloading GetParentUser
This commit is contained in:
David Markowitz
2023-06-16 01:56:02 -07:00
parent 92006123b8
commit 891648288a
23 changed files with 126 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dGame/dEntity/Entity.cpp
View File

@@ -569,31 +569,26 @@ bool Entity::operator!=(const Entity& other) const {
return !(other.m_ObjectID == m_ObjectID);
}
// Move to header
User* Entity::GetParentUser() const {
return IsPlayer() ? static_cast<const Player*>(this)->GetParentUser() : nullptr;
}
// Move to header
bool Entity::HasComponent(const eReplicaComponentType componentId) const {
return m_Components.find(componentId) != m_Components.end();
}
// Fine
void Entity::Subscribe(const LWOOBJID& scriptObjId, CppScripts::Script* scriptToAdd, const std::string& notificationName) {
void Entity::Subscribe(CppScripts::Script* scriptToAdd, const std::string& notificationName) {
Game::logger->Log("Entity", "Subscribing a script with notification %s", notificationName.c_str());
if (notificationName == "HitOrHealResult" || notificationName == "Hit") {
auto* destroyableComponent = GetComponent<DestroyableComponent>();
if (!destroyableComponent) return;
destroyableComponent->Subscribe(scriptObjId, scriptToAdd);
if (destroyableComponent) destroyableComponent->Subscribe(scriptToAdd);
}
}
// Fine
void Entity::Unsubscribe(const LWOOBJID& scriptObjId, const std::string& notificationName) {
void Entity::Unsubscribe(CppScripts::Script* scriptToRemove, const std::string& notificationName) {
Game::logger->Log("Entity", "Unsubscribing a script with notification %s", notificationName.c_str());
if (notificationName == "HitOrHealResult" || notificationName == "Hit") {
auto* destroyableComponent = GetComponent<DestroyableComponent>();
if (!destroyableComponent) return;
destroyableComponent->Unsubscribe(scriptObjId);
if (destroyableComponent) destroyableComponent->Unsubscribe(scriptToRemove);
}
}
@@ -857,7 +852,7 @@ void Entity::OnCollisionPhantom(const LWOOBJID otherEntity) {
}
}
if (!other->GetIsDead()) {
if (!other->IsDead()) {
auto* combat = GetComponent<BaseCombatAIComponent>();
if (combat != nullptr) {
@@ -1053,7 +1048,7 @@ void Entity::AddRebuildCompleteCallback(const std::function<void(Entity* user)>&
if (quickBuildComponent) quickBuildComponent->AddRebuildCompleteCallback(callback);
}
bool Entity::GetIsDead() const {
bool Entity::IsDead() const {
auto* dest = GetComponent<DestroyableComponent>();
return dest && dest->GetArmor() == 0 && dest->GetHealth() == 0;
}