Core/InstanceScript: refactored load and save methods

2 files changed, 20 insertions, 61 deletions

diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index 5a411d504aa..2066c4309b2 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -49,6 +49,7 @@ class instance_sunwell_plateau : public InstanceMapScript
         {
             instance_sunwell_plateau_InstanceMapScript(Map* map) : InstanceScript(map)
             {
+                SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
 
@@ -212,67 +213,24 @@ class instance_sunwell_plateau : public InstanceMapScript
                 return 0;
             }
 
-            std::string GetSaveData() override
-            {
-                OUT_SAVE_INST_DATA;
-
-                std::ostringstream saveStream;
-                saveStream << "S P " << GetBossSaveData();
-
-                OUT_SAVE_INST_DATA_COMPLETE;
-                return saveStream.str();
-            }
-
-            void Load(char const* str) override
-            {
-                if (!str)
-                {
-                    OUT_LOAD_INST_DATA_FAIL;
-                    return;
-                }
-
-                OUT_LOAD_INST_DATA(str);
-
-                char dataHead1, dataHead2;
-
-                std::istringstream loadStream(str);
-                loadStream >> dataHead1 >> dataHead2;
-
-                if (dataHead1 == 'S' && dataHead2 == 'P')
-                {
-                    for (uint32 i = 0; i < EncounterCount; ++i)
-                    {
-                        uint32 tmpState;
-                        loadStream >> tmpState;
-                        if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
-                            tmpState = NOT_STARTED;
-                        SetBossState(i, EncounterState(tmpState));
-                    }
-                }
-                else
-                    OUT_LOAD_INST_DATA_FAIL;
-
-                OUT_LOAD_INST_DATA_COMPLETE;
-            }
-
-            protected:
-                uint64 KalecgosDragonGUID;
-                uint64 KalecgosHumanGUID;
-                uint64 SathrovarrGUID;
-                uint64 BrutallusGUID;
-                uint64 MadrigosaGUID;
-                uint64 FelmystGUID;
-                uint64 AlythessGUID;
-                uint64 SacrolashGUID;
-                uint64 MuruGUID;
-                uint64 KilJaedenGUID;
-                uint64 KilJaedenControllerGUID;
-                uint64 AnveenaGUID;
-                uint64 KalecgosKjGUID;
-                uint32 SpectralPlayers;
-
-                uint32 SpectralRealmTimer;
-                std::vector<uint64> SpectralRealmList;
+        protected:
+            uint64 KalecgosDragonGUID;
+            uint64 KalecgosHumanGUID;
+            uint64 SathrovarrGUID;
+            uint64 BrutallusGUID;
+            uint64 MadrigosaGUID;
+            uint64 FelmystGUID;
+            uint64 AlythessGUID;
+            uint64 SacrolashGUID;
+            uint64 MuruGUID;
+            uint64 KilJaedenGUID;
+            uint64 KilJaedenControllerGUID;
+            uint64 AnveenaGUID;
+            uint64 KalecgosKjGUID;
+            uint32 SpectralPlayers;
+
+            uint32 SpectralRealmTimer;
+            std::vector<uint64> SpectralRealmList;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
index d32cdb037b2..e6aed3eddf7 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
@@ -19,6 +19,7 @@
 #define SUNWELL_PLATEAU_H
 
 #define SunwellPlateauScriptName "instance_sunwell_plateau"
+#define DataHeader "SWP"
 
 uint32 const EncounterCount = 6;