nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-16 00:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/InstanceScript): refactored load and save methods (#14977)

Browse Source 
Co-authored-by: joschiwald <736792+joschiwald@users.noreply.github.com>
This commit is contained in:
Skjalf
2023-02-12 15:53:48 -03:00
committed by GitHub
parent 5cc73e1963
commit 0dbb8c814c
126 changed files with 677 additions and 2004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
View File

@@ -21,6 +21,8 @@
#include "CreatureAIImpl.h"
#include "GridNotifiers.h"
#define DataHeader "FOS"
#define ForgeOfSoulsScriptName "instance_forge_of_souls"
enum Data

42
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
View File

@@ -40,6 +40,7 @@ public:
{
instance_forge_of_souls_InstanceScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
LoadBossBoundaries(boundaries);
}
@@ -200,46 +201,15 @@ public:
return false;
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "F S " << m_auiEncounter[0] << ' ' << m_auiEncounter[1];
str_data = saveStream.str();
OUT_SAVE_INST_DATA_COMPLETE;
return str_data;
data >> m_auiEncounter[0];
data >> m_auiEncounter[1];
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!in)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(in);
char dataHead1, dataHead2;
uint32 data0, data1;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2 >> data0 >> data1;
if (dataHead1 == 'F' && dataHead2 == 'S')
{
m_auiEncounter[0] = data0;
m_auiEncounter[1] = data1;
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED;
}
else OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
data << m_auiEncounter[0] << ' ' << m_auiEncounter[1];
}
};
};

2
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
View File

@@ -28,6 +28,8 @@
#include "SpellAuras.h"
#include "SpellScript.h"
#define DataHeader "HOR"
#define HallsOfReflectionScriptName "instance_halls_of_reflection"
enum Data

42
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
View File

@@ -126,7 +126,10 @@ public:
struct instance_halls_of_reflection_InstanceMapScript : public InstanceScript
{
instance_halls_of_reflection_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {};
instance_halls_of_reflection_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
SetHeaders(DataHeader);
};
uint32 EncounterMask;
TeamId TeamIdInInstance;
@@ -705,42 +708,15 @@ public:
return ObjectGuid::Empty;
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "H R " << EncounterMask;
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
data >> EncounterMask;
BatteredHiltStatus = (EncounterMask & (1 << DATA_BATTERED_HILT)) ? BHSF_FINISHED : BHSF_NONE;
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!in)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(in);
char dataHead1, dataHead2;
uint32 data0;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2 >> data0;
if (dataHead1 == 'H' && dataHead2 == 'R')
{
EncounterMask = data0;
BatteredHiltStatus = (EncounterMask & (1 << DATA_BATTERED_HILT)) ? BHSF_FINISHED : BHSF_NONE;
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
data << EncounterMask;
}
void OnUnitDeath(Unit* unit) override

53
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
View File

@@ -27,7 +27,10 @@ public:
struct instance_pit_of_saron_InstanceScript : public InstanceScript
{
instance_pit_of_saron_InstanceScript(Map* map) : InstanceScript(map) {}
instance_pit_of_saron_InstanceScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
TeamId teamIdInInstance;
@@ -378,48 +381,20 @@ public:
return false;
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "P S " << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' << InstanceProgress;
str_data = saveStream.str();
OUT_SAVE_INST_DATA_COMPLETE;
return str_data;
data >> m_auiEncounter[0];
data >> m_auiEncounter[1];
data >> m_auiEncounter[2];
data >> InstanceProgress;
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!in)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(in);
char dataHead1, dataHead2;
uint32 data0, data1, data2, data3;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3;
if (dataHead1 == 'P' && dataHead2 == 'S')
{
m_auiEncounter[0] = data0;
m_auiEncounter[1] = data1;
m_auiEncounter[2] = data2;
InstanceProgress = data3;
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED;
}
else OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
data << m_auiEncounter[0] << ' '
<< m_auiEncounter[1] << ' '
<< m_auiEncounter[2] << ' '
<< InstanceProgress;
}
};

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
View File

@@ -21,6 +21,8 @@
#include "Chat.h"
#include "CreatureAIImpl.h"
#define DataHeader "POS"
#define PitOfSaronScriptName "instance_pit_of_saron"
enum DataTypes