Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: Fix build

Browse Source
This commit is contained in:
Vincent-Michael
2014-09-07 02:35:17 +02:00
parent 1c3715f95a
commit feeb6d4e83
7 changed files with 12 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h
View File

@@ -22,6 +22,7 @@
#include "Creature.h"
#include "ObjectMgr.h"
#define DataHeader "BH"
#define BHScriptName "instance_baradin_hold"
uint32 const EncounterCount = 3;

46
src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
View File

@@ -36,6 +36,7 @@ class instance_baradin_hold: public InstanceMapScript
{
instance_baradin_hold_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
LoadDoorData(doorData);
@@ -101,51 +102,6 @@ class instance_baradin_hold: public InstanceMapScript
}
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "B H " << GetBossSaveData();
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
}
void Load(const char* in) override
{
if (!in)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(in);
char dataHead1, dataHead2;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'B' && dataHead2 == 'H')
{
for (uint8 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 ArgalothGUID;
uint64 OccutharGUID;

12
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
View File

@@ -267,18 +267,6 @@ class instance_zulaman : public InstanceMapScript
}
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "Z A " << GetBossSaveData() << ZulAmanState
<< ' ' << SpeedRunTimer << ' ' << ZulAmanBossCount;
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
}
void WriteSaveDataMore(std::ostringstream& data) override
{
data << ZulAmanState << ' '

1
src/server/scripts/Kalimdor/Firelands/firelands.h
View File

@@ -21,6 +21,7 @@
#include "Map.h"
#include "CreatureAI.h"
#define DataHeader "FL"
#define FirelandsScriptName "instance_firelands"
uint32 const EncounterCount = 7;

5
src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp
View File

@@ -28,10 +28,7 @@ class instance_firelands : public InstanceMapScript
{
instance_firelands_InstanceScript(InstanceMap* map) : InstanceScript(map)
{
}
void Initialize() override
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
}

1
src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
View File

@@ -18,6 +18,7 @@
#ifndef HALLS_OF_ORIGINATION_H
#define HALLS_OF_ORIGINATION_H
#define DataHeader "HOO"
#define HoOScriptName "instance_halls_of_origination"
uint32 const EncounterCount = 12;

47
src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
View File

@@ -53,6 +53,7 @@ class instance_halls_of_origination : public InstanceMapScript
{
instance_halls_of_origination_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
LoadDoorData(doorData);
TempleGuardianAnhuurGUID = 0;
@@ -211,50 +212,16 @@ class instance_halls_of_origination : public InstanceMapScript
}
}
std::string GetSaveData() override
void WriteSaveDataMore(std::ostringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "H O " << GetBossSaveData() << _deadElementals;
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
data << _deadElementals;
}
void Load(const char* str) override
void ReadSaveDataMore(std::istringstream& data) 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 == 'H' && dataHead2 == 'O')
{
for (uint32 i = 0; i < EncounterCount; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
uint32 tmp;
loadStream >> tmp;
IncreaseDeadElementals(tmp);
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
uint32 deadElementals;
data >> deadElementals;
IncreaseDeadElementals(deadElementals);
}
protected: