Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-11-04 06:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

update loop cleanup

Browse Source
This commit is contained in:
jadebenn
2023-11-21 21:19:30 -06:00
parent 81d8c187ea
commit 57a1c05e98
2 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
dGame/dComponents/PetComponent.cpp
View File

@@ -341,42 +341,18 @@ void PetComponent::Update(float deltaTime) {
}
if (m_Owner == LWOOBJID_EMPTY) {
if (m_Tamer != LWOOBJID_EMPTY) {
if (m_Timer > 0) {
m_Timer -= deltaTime;
if (m_Timer <= 0) {
m_Timer = 0;
ClientFailTamingMinigame();
}
}
} else {
if (m_Timer > 0) {
m_Timer -= deltaTime;
if (m_Timer <= 0) {
Wander();
Game::entityManager->SerializeEntity(m_Parent);
}
} else {
m_Timer = 5;
}
}
UpdateUnowned(deltaTime);
return;
}
auto* owner = GetOwner();
if (owner == nullptr) {
if (!owner) {
m_Parent->Kill();
return;
}
m_MovementAI = m_Parent->GetComponent<MovementAIComponent>();
if (m_MovementAI == nullptr) {
return;
}
if (!m_MovementAI) return;
if (m_TresureTime > 0.0f) { //TODO: Find better trigger?
InteractDig(deltaTime);
@@ -404,7 +380,6 @@ void PetComponent::Update(float deltaTime) {
if (m_Timer > 0) {
m_Timer -= deltaTime;
return;
}
@@ -468,6 +443,29 @@ skipTresure:
m_Timer = 1;
}
void PetComponent::UpdateUnowned(float deltaTime) {
if (m_Tamer != LWOOBJID_EMPTY) {
if (m_Timer > 0) {
m_Timer -= deltaTime;
if (m_Timer <= 0) {
m_Timer = 0;
ClientFailTamingMinigame();
}
}
}
else {
if (m_Timer > 0) {
m_Timer -= deltaTime;
if (m_Timer <= 0) Wander();
} else {
m_Timer = 5;
}
}
}
void PetComponent::SetIsReadyToDig(bool isReady) {
if (isReady) {
LOG("Dig state reached!");

6
dGame/dComponents/PetComponent.h
View File

@@ -47,6 +47,12 @@ public:
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override;
void Update(float deltaTime) override;
/**
* Handles updates for unowned pets
* @param deltaTime time since last update
*/
void UpdateUnowned(float deltaTime);
/**
* Handles an OnUse event from another entity, initializing the pet taming minigame if this pet is untamed.
* @param originator the entity that triggered the event