From 0ed7813e84f5c344fe229c42d8bde36ec789fa77 Mon Sep 17 00:00:00 2001 From: Angelo Venturini Date: Sat, 4 Feb 2023 20:05:20 -0300 Subject: [PATCH] refactor(Core/Instance): make SetBossState void (#13412) --- src/server/game/Instances/InstanceScript.cpp | 6 +++--- src/server/game/Instances/InstanceScript.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 6da098da8..21413f716 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -338,10 +338,11 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state) return false; } -std::string InstanceScript::LoadBossState(const char* data) +void InstanceScript::LoadBossState(const char* data) { if (!data) - return nullptr; + return; + std::istringstream loadStream(data); uint32 buff; uint32 bossId = 0; @@ -351,7 +352,6 @@ std::string InstanceScript::LoadBossState(const char* data) if (buff < TO_BE_DECIDED) SetBossState(bossId, (EncounterState)buff); } - return loadStream.str(); } std::string InstanceScript::GetBossSaveData() diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 9ba662267..f294bf2a3 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -271,7 +271,7 @@ protected: void UpdateDoorState(GameObject* door); void UpdateMinionState(Creature* minion, EncounterState state); - std::string LoadBossState(char const* data); + void LoadBossState(char const* data); std::string GetBossSaveData(); private: static void LoadObjectData(ObjectData const* creatureData, ObjectInfoMap& objectInfo);