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

Scripts/Misc: Make InstanceScript::Initialize() obsolete

Browse Source 
Move all InstanceScript initialization code from Initialize() to the constructor.
InstanceScript::Initialize() is now obsolete, please don't use it anymore. The only reason it's still in the sources is for backward compatibility.
This commit is contained in:
jackpoz
2014-09-25 22:28:20 +02:00
parent 16a884d999
commit 79b9ca4a58
32 changed files with 221 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Instances/InstanceScript.h
View File

@@ -143,6 +143,8 @@ class InstanceScript : public ZoneScript
Map* instance;
// On creation, NOT load.
// PLEASE INITIALIZE FIELDS IN THE CONSTRUCTOR INSTEAD !!!
// KEEPING THIS METHOD ONLY FOR BACKWARD COMPATIBILITY !!!
virtual void Initialize() { }
// On load

22
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
View File

@@ -76,7 +76,16 @@ public:
struct instance_blackrock_depths_InstanceMapScript : public InstanceScript
{
instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&encounter, 0, sizeof(encounter));
BarAleCount = 0;
GhostKillCount = 0;
TombTimer = TIMER_TOMBOFTHESEVEN;
TombEventCounter = 0;
}
uint32 encounter[MAX_ENCOUNTER];
std::string str_data;
@@ -115,17 +124,6 @@ public:
uint32 TombTimer;
uint32 TombEventCounter;
void Initialize() override
{
SetHeaders(DataHeader);
memset(&encounter, 0, sizeof(encounter));
BarAleCount = 0;
GhostKillCount = 0;
TombTimer = TIMER_TOMBOFTHESEVEN;
TombEventCounter = 0;
}
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())

7
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
View File

@@ -63,13 +63,6 @@ public:
SetBossNumber(EncounterCount);
}
void Initialize() override
{
// Razorgore
EggCount = 0;
EggEvent = 0;
}
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())

14
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
View File

@@ -56,7 +56,12 @@ class instance_deadmines : public InstanceMapScript
struct instance_deadmines_InstanceMapScript : public InstanceScript
{
instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
State = CANNON_NOT_USED;
}
ObjectGuid FactoryDoorGUID;
ObjectGuid IronCladDoorGUID;
@@ -71,13 +76,6 @@ class instance_deadmines : public InstanceMapScript
uint32 PiratesDelay_Timer;
ObjectGuid uiSmiteChestGUID;
void Initialize() override
{
SetHeaders(DataHeader);
State = CANNON_NOT_USED;
}
virtual void Update(uint32 diff) override
{
if (!IronCladDoorGUID || !DefiasCannonGUID || !DoorLeverGUID)

6
src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
View File

@@ -37,6 +37,7 @@ public:
instance_gnomeregan_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -46,11 +47,6 @@ public:
ObjectGuid uiBastmasterEmiShortfuseGUID;
void Initialize() override
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
}
void Load(const char* in) override
{
if (!in)

20
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
View File

@@ -56,7 +56,15 @@ public:
struct instance_karazhan_InstanceMapScript : public InstanceScript
{
instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
// 1 - OZ, 2 - HOOD, 3 - RAJ, this never gets altered.
m_uiOperaEvent = urand(1, 3);
m_uiOzDeathCount = 0;
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string strSaveData;
@@ -80,16 +88,6 @@ public:
ObjectGuid ImageGUID;
ObjectGuid DustCoveredChest;
void Initialize() override
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
// 1 - OZ, 2 - HOOD, 3 - RAJ, this never gets altered.
m_uiOperaEvent = urand(1, 3);
m_uiOzDeathCount = 0;
}
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)

18
src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
View File

@@ -78,7 +78,14 @@ public:
struct instance_shadowfang_keep_InstanceMapScript : public InstanceScript
{
instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
uiPhase = 0;
uiTimer = 0;
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
@@ -94,15 +101,6 @@ public:
uint8 uiPhase;
uint16 uiTimer;
void Initialize() override
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
uiPhase = 0;
uiTimer = 0;
}
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())

17
src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
View File

@@ -50,6 +50,11 @@ class instance_stratholme : public InstanceMapScript
instance_stratholme_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
EncounterState[i] = NOT_STARTED;
for (uint8 i = 0; i < 5; ++i)
IsSilverHandDead[i] = false;
}
uint32 EncounterState[MAX_ENCOUNTER];
@@ -73,18 +78,6 @@ class instance_stratholme : public InstanceMapScript
GuidSet abomnationGUID;
EventMap events;
void Initialize() override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
EncounterState[i] = NOT_STARTED;
for (uint8 i = 0; i < 5; ++i)
IsSilverHandDead[i] = false;
crystalsGUID.clear();
abomnationGUID.clear();
}
bool StartSlaugtherSquare()
{
//change to DONE when crystals implemented

21
src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
View File

@@ -61,6 +61,14 @@ public:
instance_sunken_temple_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
State = 0;
s1 = false;
s2 = false;
s3 = false;
s4 = false;
s5 = false;
s6 = false;
}
ObjectGuid GOAtalaiStatue1;
@@ -80,19 +88,6 @@ public:
bool s5;
bool s6;
void Initialize() override
{
State = 0;
s1 = false;
s2 = false;
s3 = false;
s4 = false;
s5 = false;
s6 = false;
}
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())

4
src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
View File

@@ -45,9 +45,7 @@ class instance_uldaman : public InstanceMapScript
struct instance_uldaman_InstanceMapScript : public InstanceScript
{
instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize() override
instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));

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

@@ -66,7 +66,21 @@ class instance_zulaman : public InstanceMapScript
struct instance_zulaman_InstanceMapScript : public InstanceScript
{
instance_zulaman_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_zulaman_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
QuestTimer = 0;
QuestMinute = 0;
BossKilled = 0;
ChestLooted = 0;
for (uint8 i = 0; i < RAND_VENDOR; ++i)
RandVendor[i] = NOT_STARTED;
m_auiEncounter[DATA_GONGEVENT] = NOT_STARTED;
}
ObjectGuid HarkorsSatchelGUID;
ObjectGuid TanzarsTrunkGUID;
@@ -90,22 +104,6 @@ class instance_zulaman : public InstanceMapScript
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint32 RandVendor[RAND_VENDOR];
void Initialize() override
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
QuestTimer = 0;
QuestMinute = 0;
BossKilled = 0;
ChestLooted = 0;
for (uint8 i = 0; i < RAND_VENDOR; ++i)
RandVendor[i] = NOT_STARTED;
m_auiEncounter[DATA_GONGEVENT] = NOT_STARTED;
}
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)

18
src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
View File

@@ -64,7 +64,14 @@ public:
struct instance_blackfathom_deeps_InstanceMapScript : public InstanceScript
{
instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&encounter, 0, sizeof(encounter));
countFires = 0;
deathTimes = 0;
}
ObjectGuid twilightLordKelrisGUID;
ObjectGuid shrine1GUID;
@@ -79,15 +86,6 @@ public:
uint8 countFires;
uint8 deathTimes;
void Initialize() override
{
SetHeaders(DataHeader);
memset(&encounter, 0, sizeof(encounter));
countFires = 0;
deathTimes = 0;
}
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())

14
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
View File

@@ -54,19 +54,17 @@ public:
struct instance_mount_hyjal_InstanceMapScript : public InstanceScript
{
instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize() override
instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
RaidDamage = 0;
Trash = 0;
hordeRetreat = 0;
allianceRetreat = 0;
RaidDamage = 0;
Trash = 0;
hordeRetreat = 0;
allianceRetreat = 0;
ArchiYell = false;
ArchiYell = false;
}
bool IsEncounterInProgress() const override

18
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
View File

@@ -52,7 +52,14 @@ public:
struct instance_old_hillsbrad_InstanceMapScript : public InstanceScript
{
instance_old_hillsbrad_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_old_hillsbrad_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
mBarrelCount = 0;
mThrallEventCount = 0;
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint32 mBarrelCount;
@@ -62,15 +69,6 @@ public:
ObjectGuid TarethaGUID;
ObjectGuid EpochGUID;
void Initialize() override
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
mBarrelCount = 0;
mThrallEventCount = 0;
}
Player* GetPlayerInMap()
{
Map::PlayerList const& players = instance->GetPlayers();

12
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
View File

@@ -80,7 +80,11 @@ public:
struct instance_the_black_morass_InstanceMapScript : public InstanceScript
{
instance_the_black_morass_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_the_black_morass_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
Clear();
}
uint32 m_auiEncounter[EncounterCount];
@@ -92,12 +96,6 @@ public:
ObjectGuid _medivhGUID;
uint8 _currentRiftId;
void Initialize() override
{
SetHeaders(DataHeader);
Clear();
}
void Clear()
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));

18
src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
View File

@@ -43,24 +43,22 @@ public:
struct instance_onyxias_lair_InstanceMapScript : public InstanceScript
{
instance_onyxias_lair_InstanceMapScript(Map* map) : InstanceScript(map) { }
//Eruption is a BFS graph problem
//One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed
void Initialize() override
instance_onyxias_lair_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
onyxiaLiftoffTimer = 0;
manyWhelpsCounter = 0;
eruptTimer = 0;
onyxiaLiftoffTimer = 0;
manyWhelpsCounter = 0;
eruptTimer = 0;
achievManyWhelpsHandleIt = false;
achievSheDeepBreathMore = true;
achievSheDeepBreathMore = true;
}
//Eruption is a BFS graph problem
//One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())

14
src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
View File

@@ -55,16 +55,12 @@ public:
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
}
void Initialize() override
{
gongWave = 0;
fiendsKilled = 0;
reaversKilled = 0;
summonLowRange = 0;
gongWave = 0;
fiendsKilled = 0;
reaversKilled = 0;
summonLowRange = 0;
summonHighRange = 0;
summonCreature = 0;
summonCreature = 0;
}
void OnGameObjectCreate(GameObject* gameObject) override

10
src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
View File

@@ -42,17 +42,15 @@ public:
struct instance_razorfen_kraul_InstanceMapScript : public InstanceScript
{
instance_razorfen_kraul_InstanceMapScript(Map* map) : InstanceScript(map) { }
ObjectGuid DoorWardGUID;
int WardKeeperDeath;
void Initialize() override
instance_razorfen_kraul_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
WardKeeperDeath = 0;
}
ObjectGuid DoorWardGUID;
int WardKeeperDeath;
Player* GetPlayerInMap()
{
Map::PlayerList const& players = instance->GetPlayers();

24
src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
View File

@@ -39,7 +39,17 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript
{
instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
IsBossDied[0] = false;
IsBossDied[1] = false;
IsBossDied[2] = false;
BugTrioDeathCount = 0;
CthunPhase = 0;
}
//If Vem is dead...
bool IsBossDied[3];
@@ -56,18 +66,6 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
uint32 CthunPhase;
void Initialize() override
{
SetHeaders(DataHeader);
IsBossDied[0] = false;
IsBossDied[1] = false;
IsBossDied[2] = false;
BugTrioDeathCount = 0;
CthunPhase = 0;
}
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())

14
src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
View File

@@ -41,14 +41,7 @@ public:
struct instance_wailing_caverns_InstanceMapScript : public InstanceScript
{
instance_wailing_caverns_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint32 m_auiEncounter[MAX_ENCOUNTER];
bool yelled;
ObjectGuid NaralexGUID;
void Initialize() override
instance_wailing_caverns_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -56,6 +49,11 @@ public:
yelled = false;
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
bool yelled;
ObjectGuid NaralexGUID;
void OnCreatureCreate(Creature* creature) override
{
if (creature->GetEntry() == DATA_NARALEX)

20
src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
View File

@@ -108,7 +108,15 @@ public:
struct instance_zulfarrak_InstanceMapScript : public InstanceScript
{
instance_zulfarrak_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_zulfarrak_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
PyramidPhase = 0;
major_wave_Timer = 0;
minor_wave_Timer = 0;
addGroupSize = 0;
waypoint = 0;
}
uint32 GahzRillaEncounter;
ObjectGuid ZumrahGUID;
@@ -124,16 +132,6 @@ public:
uint32 addGroupSize;
uint32 waypoint;
void Initialize() override
{
SetHeaders(DataHeader);
PyramidPhase = 0;
major_wave_Timer = 0;
minor_wave_Timer = 0;
addGroupSize = 0;
waypoint = 0;
}
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())

4
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
View File

@@ -30,9 +30,7 @@ public:
struct instance_obsidian_sanctum_InstanceMapScript : public InstanceScript
{
instance_obsidian_sanctum_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize() override
instance_obsidian_sanctum_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}

24
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
View File

@@ -41,7 +41,17 @@ public:
struct instance_trial_of_the_champion_InstanceMapScript : public InstanceScript
{
instance_trial_of_the_champion_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_trial_of_the_champion_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
uiMovementDone = 0;
uiGrandChampionsDeaths = 0;
uiArgentSoldierDeaths = 0;
bDone = false;
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -66,18 +76,6 @@ public:
bool bDone;
void Initialize() override
{
SetHeaders(DataHeader);
uiMovementDone = 0;
uiGrandChampionsDeaths = 0;
uiArgentSoldierDeaths = 0;
bDone = false;
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
}
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)

4
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
View File

@@ -29,9 +29,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
struct instance_trial_of_the_crusader_InstanceMapScript : public InstanceScript
{
instance_trial_of_the_crusader_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize() override
instance_trial_of_the_crusader_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTERS);

12
src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
View File

@@ -40,7 +40,11 @@ public:
struct instance_nexus_InstanceMapScript : public InstanceScript
{
instance_nexus_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_nexus_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
}
uint32 m_auiEncounter[NUMBER_OF_ENCOUNTERS];
@@ -53,12 +57,6 @@ public:
std::string strInstData;
void Initialize() override
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
}
void OnCreatureCreate(Creature* creature) override
{
Map::PlayerList const &players = instance->GetPlayers();

52
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
View File

@@ -60,7 +60,32 @@ class instance_ulduar : public InstanceMapScript
struct instance_ulduar_InstanceMapScript : public InstanceScript
{
instance_ulduar_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { }
instance_ulduar_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
LoadDoorData(doorData);
LoadMinionData(minionData);
_algalonTimer = 61;
_maxArmorItemLevel = 0;
_maxWeaponItemLevel = 0;
TeamInInstance = 0;
HodirRareCacheData = 0;
ColossusData = 0;
elderCount = 0;
illusion = 0;
keepersCount = 0;
conSpeedAtory = false;
Unbroken = true;
IsDriveMeCrazyEligible = true;
_algalonSummoned = false;
_summonAlgalon = false;
memset(_summonObservationRingKeeper, 0, sizeof(_summonObservationRingKeeper));
memset(_summonYSKeeper, 0, sizeof(_summonYSKeeper));
}
// Creatures
ObjectGuid LeviathanGUID;
@@ -119,31 +144,6 @@ class instance_ulduar : public InstanceMapScript
bool Unbroken;
bool IsDriveMeCrazyEligible;
void Initialize() override
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
LoadDoorData(doorData);
LoadMinionData(minionData);
_algalonTimer = 61;
_maxArmorItemLevel = 0;
_maxWeaponItemLevel = 0;
TeamInInstance = 0;
HodirRareCacheData = 0;
ColossusData = 0;
elderCount = 0;
illusion = 0;
keepersCount = 0;
conSpeedAtory = false;
Unbroken = true;
IsDriveMeCrazyEligible = true;
_algalonSummoned = false;
_summonAlgalon = false;
memset(_summonObservationRingKeeper, 0, sizeof(_summonObservationRingKeeper));
memset(_summonYSKeeper, 0, sizeof(_summonYSKeeper));
}
void FillInitialWorldStates(WorldPacket& packet) override
{
packet << uint32(WORLD_STATE_ALGALON_TIMER_ENABLED) << uint32(_algalonTimer && _algalonTimer <= 60);

58
src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
View File

@@ -112,7 +112,34 @@ public:
struct instance_violet_hold_InstanceMapScript : public InstanceScript
{
instance_violet_hold_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_violet_hold_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
uiRemoveNpc = 0;
uiDoorIntegrity = 100;
uiWaveCount = 0;
uiLocation = urand(0, 5);
uiFirstBoss = 0;
uiSecondBoss = 0;
uiCountErekemGuards = 0;
uiCountActivationCrystals = 0;
uiCyanigosaEventPhase = 1;
uiActivationTimer = 5000;
uiDoorSpellTimer = 2000;
uiCyanigosaEventTimer = 3 * IN_MILLISECONDS;
bActive = false;
bIsDoorSpellCast = false;
bCrystalActivated = false;
defenseless = true;
uiMainEventPhase = NOT_STARTED;
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
}
ObjectGuid uiMoragg;
ObjectGuid uiErekem;
@@ -168,35 +195,6 @@ public:
std::string str_data;
void Initialize() override
{
SetHeaders(DataHeader);
uiRemoveNpc = 0;
uiDoorIntegrity = 100;
uiWaveCount = 0;
uiLocation = urand(0, 5);
uiFirstBoss = 0;
uiSecondBoss = 0;
uiCountErekemGuards = 0;
uiCountActivationCrystals = 0;
uiCyanigosaEventPhase = 1;
uiActivationTimer = 5000;
uiDoorSpellTimer = 2000;
uiCyanigosaEventTimer = 3*IN_MILLISECONDS;
bActive = false;
bIsDoorSpellCast = false;
bCrystalActivated = false;
defenseless = true;
uiMainEventPhase = NOT_STARTED;
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
}
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)

5
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
View File

@@ -88,10 +88,6 @@ class instance_serpent_shrine : public InstanceMapScript
instance_serpentshrine_cavern_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
void Initialize() override
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
StrangePool = 0;
@@ -106,7 +102,6 @@ class instance_serpent_shrine : public InstanceMapScript
FrenzySpawnTimer = 2000;
DoSpawnFrenzy = false;
TrashCount = 0;
}
bool IsEncounterInProgress() const override

4
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
View File

@@ -37,10 +37,6 @@ class instance_ramparts : public InstanceMapScript
instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map)
{
spawned = false;
}
void Initialize() override
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
}

14
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
View File

@@ -54,6 +54,11 @@ class instance_magtheridons_lair : public InstanceMapScript
{
instance_magtheridons_lair_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
CageTimer = 0;
RespawnTimer = 0;
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -66,15 +71,6 @@ class instance_magtheridons_lair : public InstanceMapScript
uint32 CageTimer;
uint32 RespawnTimer;
void Initialize() override
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
CageTimer = 0;
RespawnTimer = 0;
}
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)

4
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
View File

@@ -39,9 +39,7 @@ class instance_shattered_halls : public InstanceMapScript
struct instance_shattered_halls_InstanceMapScript : public InstanceScript
{
instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize() override
instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

18
src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
View File

@@ -46,7 +46,14 @@ class instance_the_eye : public InstanceMapScript
struct instance_the_eye_InstanceMapScript : public InstanceScript
{
instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
KaelthasEventPhase = 0;
AlarEventPhase = 0;
}
ObjectGuid ThaladredTheDarkener;
ObjectGuid LordSanguinar;
@@ -60,15 +67,6 @@ class instance_the_eye : public InstanceMapScript
uint32 m_auiEncounter[MAX_ENCOUNTER];
void Initialize() override
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
KaelthasEventPhase = 0;
AlarEventPhase = 0;
}
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)