diff --git a/CMakeLists.txt b/CMakeLists.txt index cf7988c8..9789aff8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ if (__include_backtrace__ AND __compile_backtrace__) link_directories(${backtrace_SOURCE_DIR}/.libs/) include_directories(${backtrace_SOURCE_DIR}) -endif(__include_backtrace__) +endif(__include_backtrace__ AND __compile_backtrace__) endif() endif(UNIX) diff --git a/dGame/Entity.cpp b/dGame/Entity.cpp index c98323a9..1d31eb8d 100644 --- a/dGame/Entity.cpp +++ b/dGame/Entity.cpp @@ -1222,13 +1222,19 @@ void Entity::UpdateXMLDoc(tinyxml2::XMLDocument* doc) { } void Entity::Update(const float deltaTime) { - for (int i = 0; i < m_Timers.size(); i++) { + int timerSize = m_Timers.size(); + for (int i = 0; i < timerSize; i++) { m_Timers[i]->Update(deltaTime); if (m_Timers[i]->GetTime() <= 0) { const auto timerName = m_Timers[i]->GetName(); - delete m_Timers[i]; - m_Timers.erase(m_Timers.begin() + i); + do { //sometimes, due to a race condition, m_Timers.erase doesn't actually erase, repeat until it does + if (m_Timers[i]->GetName() != timerName) { + break; + } + delete m_Timers[i]; + m_Timers.erase(m_Timers.begin() + i); + } while (m_Timers.size() == timerSize); //timer size indicates whether it's actually successfully been erased or not for (CppScripts::Script* script : CppScripts::GetEntityScripts(this)) { script->OnTimerDone(this, timerName); diff --git a/dScripts/AgShipShake.cpp b/dScripts/AgShipShake.cpp new file mode 100644 index 00000000..643bc695 --- /dev/null +++ b/dScripts/AgShipShake.cpp @@ -0,0 +1,93 @@ +#include "AgShipShake.h" +#include "GeneralUtils.h" +#include "GameMessages.h" +#include "dZoneManager.h" +#include "EntityManager.h" +#include "Game.h" + +void AgShipShake::OnStartup(Entity* self) { + EntityInfo info{}; + + info.pos = { -418, 585, -30 }; + info.lot = 33; + info.spawnerID = self->GetObjectID(); + + auto* ref = EntityManager::Instance()->CreateEntity(info); + + EntityManager::Instance()->ConstructEntity(ref); + + self->SetVar(u"ShakeObject", ref->GetObjectID()); + + self->AddTimer("ShipShakeIdle", 1.0f); + self->SetVar(u"RandomTime", 10); +} + +void AgShipShake::OnTimerDone(Entity* self, std::string timerName) { + if (timerName == "ShipShakeExplode") { + DoShake(self, true); + } + else if (timerName == "ShipShakeIdle") { + DoShake(self, false); + } +} + +void AgShipShake::DoShake(Entity* self, bool explodeIdle) { + if (!explodeIdle) { + auto* ref = EntityManager::Instance()->GetEntity(self->GetVar(u"ShakeObject")); + + const auto randomTime = self->GetVar(u"RandomTime"); + auto time = GeneralUtils::GenerateRandomNumber(0, randomTime + 1); + + if (time < randomTime / 2) { + time += randomTime / 2; + } + + self->AddTimer("ShipShakeIdle", static_cast(time)); + + if (ref) + GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(ref, FXName, ref->GetObjectID(), 500.0f); + + auto* debrisObject = GetEntityInGroup(DebrisFX); + + if (debrisObject) + GameMessages::SendPlayFXEffect(debrisObject, -1, u"DebrisFall", "Debris", LWOOBJID_EMPTY, 1.0f, 1.0f, true); + + const auto randomFx = GeneralUtils::GenerateRandomNumber(0, 3); + + auto* shipFxObject = GetEntityInGroup(ShipFX); + if (shipFxObject) { + std::string effectType = "shipboom" + std::to_string(randomFx); + GameMessages::SendPlayFXEffect(shipFxObject, 559, GeneralUtils::ASCIIToUTF16(effectType), "FX", LWOOBJID_EMPTY, 1.0f, 1.0f, true); + } + + self->AddTimer("ShipShakeExplode", 5.0f); + + auto* shipFxObject2 = GetEntityInGroup(ShipFX2); + if (shipFxObject2) + GameMessages::SendPlayAnimation(shipFxObject2, u"explosion"); + } + else { + auto* shipFxObject = GetEntityInGroup(ShipFX); + auto* shipFxObject2 = GetEntityInGroup(ShipFX2); + + if (shipFxObject) + GameMessages::SendPlayAnimation(shipFxObject, u"idle"); + + if (shipFxObject2) + GameMessages::SendPlayAnimation(shipFxObject2, u"idle"); + } +} + +Entity* AgShipShake::GetEntityInGroup(const std::string& group) { + auto entities = EntityManager::Instance()->GetEntitiesInGroup(group); + Entity* en = nullptr; + + for (auto entity : entities) { + if (entity) { + en = entity; + break; + } + } + + return en; +} diff --git a/dScripts/AgShipShake.h b/dScripts/AgShipShake.h new file mode 100644 index 00000000..b1e1b557 --- /dev/null +++ b/dScripts/AgShipShake.h @@ -0,0 +1,18 @@ +#pragma once +#include "CppScripts.h" + +class AgShipShake : public CppScripts::Script { +public: + void OnStartup(Entity* self); + void OnTimerDone(Entity* self, std::string timerName); + void DoShake(Entity* self, bool explodeIdle); + + std::string DebrisFX = "DebrisFX"; + std::string ShipFX = "ShipFX"; + std::string ShipFX2 = "ShipFX2"; + std::u16string FXName = u"camshake-bridge"; + +private: + Entity* GetEntityInGroup(const std::string& group); +}; + diff --git a/dScripts/AgSpaceStuff.cpp b/dScripts/AgSpaceStuff.cpp index 2550f001..1e82237e 100644 --- a/dScripts/AgSpaceStuff.cpp +++ b/dScripts/AgSpaceStuff.cpp @@ -1,7 +1,6 @@ #include "AgSpaceStuff.h" #include "GeneralUtils.h" #include "GameMessages.h" -#include "dZoneManager.h" #include "EntityManager.h" #include "Game.h" @@ -17,11 +16,6 @@ void AgSpaceStuff::OnStartup(Entity* self) { auto* ref = EntityManager::Instance()->CreateEntity(info); EntityManager::Instance()->ConstructEntity(ref); - - self->SetVar(u"ShakeObject", ref->GetObjectID()); - - self->AddTimer("ShipShakeIdle", 1.0f); - self->SetVar(u"RandomTime", 10); } void AgSpaceStuff::OnTimerDone(Entity* self, std::string timerName) { @@ -38,72 +32,4 @@ void AgSpaceStuff::OnTimerDone(Entity* self, std::string timerName) { GameMessages::SendPlayAnimation(self, u"path_0" + (GeneralUtils::to_u16string(pathType))); self->AddTimer("FloaterScale", randTime); } - else if (timerName == "ShipShakeExplode") { - DoShake(self, true); - } - else if (timerName == "ShipShakeIdle") { - DoShake(self, false); - } -} - -void AgSpaceStuff::DoShake(Entity* self, bool explodeIdle) { - - if (!explodeIdle) { - auto* ref = EntityManager::Instance()->GetEntity(self->GetVar(u"ShakeObject")); - - const auto randomTime = self->GetVar(u"RandomTime"); - auto time = GeneralUtils::GenerateRandomNumber(0, randomTime + 1); - - if (time < randomTime / 2) { - time += randomTime / 2; - } - - self->AddTimer("ShipShakeIdle", static_cast(time)); - - if (ref) - GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(ref, FXName, ref->GetObjectID(), 500.0f); - - auto* debrisObject = GetEntityInGroup(DebrisFX); - - if (debrisObject) - GameMessages::SendPlayFXEffect(debrisObject, -1, u"DebrisFall", "Debris", LWOOBJID_EMPTY, 1.0f, 1.0f, true); - - const auto randomFx = GeneralUtils::GenerateRandomNumber(0, 3); - - auto* shipFxObject = GetEntityInGroup(ShipFX); - if (shipFxObject) { - std::string effectType = "shipboom" + std::to_string(randomFx); - GameMessages::SendPlayFXEffect(shipFxObject, 559, GeneralUtils::ASCIIToUTF16(effectType), "FX", LWOOBJID_EMPTY, 1.0f, 1.0f, true); - } - - self->AddTimer("ShipShakeExplode", 5.0f); - - auto* shipFxObject2 = GetEntityInGroup(ShipFX2); - if (shipFxObject2) - GameMessages::SendPlayAnimation(shipFxObject2, u"explosion"); - } - else { - auto* shipFxObject = GetEntityInGroup(ShipFX); - auto* shipFxObject2 = GetEntityInGroup(ShipFX2); - - if (shipFxObject) - GameMessages::SendPlayAnimation(shipFxObject, u"idle"); - - if (shipFxObject2) - GameMessages::SendPlayAnimation(shipFxObject2, u"idle"); - } -} - -Entity* AgSpaceStuff::GetEntityInGroup(const std::string& group) { - auto entities = EntityManager::Instance()->GetEntitiesInGroup(group); - Entity* en = nullptr; - - for (auto entity : entities) { - if (entity) { - en = entity; - break; - } - } - - return en; } diff --git a/dScripts/AgSpaceStuff.h b/dScripts/AgSpaceStuff.h index 8d816691..13b29f1c 100644 --- a/dScripts/AgSpaceStuff.h +++ b/dScripts/AgSpaceStuff.h @@ -5,14 +5,4 @@ class AgSpaceStuff : public CppScripts::Script { public: void OnStartup(Entity* self); void OnTimerDone(Entity* self, std::string timerName); - void DoShake(Entity* self, bool explodeIdle); - - std::string DebrisFX = "DebrisFX"; - std::string ShipFX = "ShipFX"; - std::string ShipFX2 = "ShipFX2"; - std::u16string FXName = u"camshake-bridge"; - -private: - Entity* GetEntityInGroup(const std::string& group); }; - diff --git a/dScripts/CppScripts.cpp b/dScripts/CppScripts.cpp index 99702805..a07d4f52 100644 --- a/dScripts/CppScripts.cpp +++ b/dScripts/CppScripts.cpp @@ -15,6 +15,7 @@ //VE / AG scripts: #include "AgShipPlayerDeathTrigger.h" #include "AgShipPlayerShockServer.h" +#include "AgShipShake.h" #include "AgSpaceStuff.h" #include "AgImagSmashable.h" #include "NpcNpSpacemanBob.h" @@ -290,7 +291,9 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr script = new AgShipPlayerDeathTrigger(); else if (scriptName == "scripts\\ai\\NP\\L_NPC_NP_SPACEMAN_BOB.lua") script = new NpcNpSpacemanBob(); - else if (scriptName == "scripts\\ai\\AG\\L_AG_SPACE_STUFF.lua") // Broken, will (sometimes) display all animations at once on initial login + else if (scriptName == "scripts\\ai\\AG\\L_AG_SHIP_SHAKE.lua") + script = new AgShipShake(); + else if (scriptName == "scripts\\ai\\AG\\L_AG_SPACE_STUFF.lua") script = new AgSpaceStuff(); else if (scriptName == "scripts\\ai\\AG\\L_AG_SHIP_PLAYER_SHOCK_SERVER.lua") script = new AgShipPlayerShockServer();