Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-04 08:07:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Instances: merged some master branch commits in preparation for merging the upcomming instance save rewrite

Browse Source
This commit is contained in:
Ovahlord
2018-07-28 02:00:24 +02:00
parent 92ef398f56
commit 78ed8acdcc
73 changed files with 74 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp
View File

@@ -81,7 +81,7 @@ class instance_bastion_of_twilight : public InstanceMapScript
struct instance_bastion_of_twilight_InstanceMapScript : public InstanceScript
{
instance_bastion_of_twilight_InstanceMapScript(Map* map) : InstanceScript(map)
instance_bastion_of_twilight_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(!map->IsHeroic() ? EncounterCountNormal : EncounterCountHeroic); // Sinestra only in heroic mode

3
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
View File

@@ -18,7 +18,6 @@
#include "ScriptMgr.h"
#include "blackrock_caverns.h"
#include "InstanceScript.h"
#include "Map.h"
ObjectData const creatureData[] =
{
@@ -39,7 +38,7 @@ class instance_blackrock_caverns : public InstanceMapScript
struct instance_blackrock_caverns_InstanceMapScript : public InstanceScript
{
instance_blackrock_caverns_InstanceMapScript(Map* map) : InstanceScript(map)
instance_blackrock_caverns_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

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

@@ -82,7 +82,7 @@ public:
struct instance_blackrock_depths_InstanceMapScript : public InstanceScript
{
instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map)
instance_blackrock_depths_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&encounter, 0, sizeof(encounter));

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

@@ -72,7 +72,7 @@ public:
struct instance_blackwing_lair_InstanceMapScript : public InstanceScript
{
instance_blackwing_lair_InstanceMapScript(Map* map) : InstanceScript(map)
instance_blackwing_lair_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

2
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
View File

@@ -48,7 +48,7 @@ class instance_molten_core : public InstanceMapScript
struct instance_molten_core_InstanceMapScript : public InstanceScript
{
instance_molten_core_InstanceMapScript(Map* map) : InstanceScript(map)
instance_molten_core_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);

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

@@ -114,7 +114,7 @@ class instance_deadmines : public InstanceMapScript
struct instance_deadmines_InstanceMapScript : public InstanceScript
{
instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map)
instance_deadmines_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(map->IsHeroic() ? EncounterCount : EncounterCount - 1); // Vanessa van Cleef only in heroic mode

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

@@ -33,7 +33,7 @@ public:
struct instance_gnomeregan_InstanceMapScript : public InstanceScript
{
instance_gnomeregan_InstanceMapScript(Map* map) : InstanceScript(map)
instance_gnomeregan_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));

2
src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp
View File

@@ -41,7 +41,7 @@ class instance_grim_batol : public InstanceMapScript
struct instance_grim_batol_InstanceMapScript : public InstanceScript
{
instance_grim_batol_InstanceMapScript(Map* map) : InstanceScript(map)
instance_grim_batol_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

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

@@ -65,7 +65,7 @@ public:
struct instance_karazhan_InstanceMapScript : public InstanceScript
{
instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map)
instance_karazhan_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

2
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
View File

@@ -52,7 +52,7 @@ class instance_magisters_terrace : public InstanceMapScript
struct instance_magisters_terrace_InstanceMapScript : public InstanceScript
{
instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map)
instance_magisters_terrace_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

2
src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
View File

@@ -35,7 +35,7 @@ class instance_scarlet_monastery : public InstanceMapScript
struct instance_scarlet_monastery_InstanceMapScript : public InstanceScript
{
instance_scarlet_monastery_InstanceMapScript(Map* map) : InstanceScript(map)
instance_scarlet_monastery_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

2
src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
View File

@@ -31,7 +31,7 @@ class instance_scholomance : public InstanceMapScript
struct instance_scholomance_InstanceMapScript : public InstanceScript
{
instance_scholomance_InstanceMapScript(Map* map) : InstanceScript(map)
instance_scholomance_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

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

@@ -65,7 +65,7 @@ public:
struct instance_shadowfang_keep_InstanceMapScript : public InstanceScript
{
instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map)
instance_shadowfang_keep_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

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

@@ -57,7 +57,7 @@ class instance_stratholme : public InstanceMapScript
struct instance_stratholme_InstanceMapScript : public InstanceScript
{
instance_stratholme_InstanceMapScript(Map* map) : InstanceScript(map)
instance_stratholme_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);

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

@@ -65,7 +65,7 @@ public:
struct instance_sunken_temple_InstanceMapScript : public InstanceScript
{
instance_sunken_temple_InstanceMapScript(Map* map) : InstanceScript(map)
instance_sunken_temple_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
State = 0;

2
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
View File

@@ -51,7 +51,7 @@ class instance_sunwell_plateau : public InstanceMapScript
struct instance_sunwell_plateau_InstanceMapScript : public InstanceScript
{
instance_sunwell_plateau_InstanceMapScript(Map* map) : InstanceScript(map)
instance_sunwell_plateau_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

3
src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
View File

@@ -17,7 +17,6 @@
#include "ScriptMgr.h"
#include "InstanceScript.h"
#include "Map.h"
#include "the_stockade.h"
class instance_the_stockade : public InstanceMapScript
@@ -27,7 +26,7 @@ public:
struct instance_the_stockade_InstanceMapScript : public InstanceScript
{
instance_the_stockade_InstanceMapScript(Map* map) : InstanceScript(map)
instance_the_stockade_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

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

@@ -60,7 +60,7 @@ class instance_uldaman : public InstanceMapScript
struct instance_uldaman_InstanceMapScript : public InstanceScript
{
instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map)
instance_uldaman_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));

3
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
View File

@@ -20,7 +20,6 @@
#include "Creature.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Map.h"
#include "zulgurub.h"
DoorData const doorData[] =
@@ -40,7 +39,7 @@ class instance_zulgurub : public InstanceMapScript
struct instance_zulgurub_InstanceMapScript : public InstanceScript
{
instance_zulgurub_InstanceMapScript(Map* map) : InstanceScript(map)
instance_zulgurub_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);