diff options
author | ccrs <ccrs@users.noreply.github.com> | 2019-07-01 01:08:21 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-12-13 00:42:19 +0100 |
commit | 2e4f38d94927733cb03ea5172cad636a31fd8740 (patch) | |
tree | d9f49fcf16255e016b90876f7ad923782afc5043 /src | |
parent | 3bc4fc65b930f1ed31ded0b526f09c70884a0f28 (diff) |
Scripts/ICC: cleanup ReadSaveDataMore definition
(cherry picked from commit 4c398743b9ea67090dcb390643a7aa5bd49348c3)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 0dc66d1c9df..35f40a8f0db 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -22,7 +22,6 @@ #include "InstanceScript.h" #include "Map.h" #include "ObjectMgr.h" -#include "Pet.h" #include "Player.h" #include "PoolMgr.h" #include "TemporarySummon.h" @@ -1323,21 +1322,20 @@ class instance_icecrown_citadel : public InstanceMapScript void ReadSaveDataMore(std::istringstream& data) override { + uint32 temp = 0; + data >> HeroicAttempts; - uint32 temp = 0; data >> temp; - if (temp == IN_PROGRESS) - ColdflameJetsState = NOT_STARTED; - else - ColdflameJetsState = temp ? DONE : NOT_STARTED; + ColdflameJetsState = temp == DONE ? DONE : NOT_STARTED; data >> temp; - BloodQuickeningState = temp ? DONE : NOT_STARTED; // DONE means finished (not success/fail) + BloodQuickeningState = temp == DONE ? DONE : NOT_STARTED; + data >> BloodQuickeningMinutes; data >> temp; - UpperSpireTeleporterActiveState = temp ? DONE : NOT_STARTED; + UpperSpireTeleporterActiveState = temp == DONE ? DONE : NOT_STARTED; } void Update(uint32 diff) override |