Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +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

1
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
View File

@@ -21,7 +21,6 @@
#include "Creature.h"
#include "CreatureAI.h"
#include "InstanceScript.h"
#include "Map.h"
DoorData const doorData[] =
{

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

@@ -19,7 +19,6 @@
#include "AreaBoundary.h"
#include "Creature.h"
#include "InstanceScript.h"
#include "Map.h"
#include "obsidian_sanctum.h"
/* Obsidian Sanctum encounters:
@@ -38,7 +37,7 @@ public:
struct instance_obsidian_sanctum_InstanceMapScript : public InstanceScript
{
instance_obsidian_sanctum_InstanceMapScript(Map* map) : InstanceScript(map)
instance_obsidian_sanctum_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

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

@@ -41,7 +41,7 @@ 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(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
uiMovementDone = 0;

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

@@ -43,7 +43,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)
instance_trial_of_the_crusader_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTERS);

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

@@ -86,7 +86,7 @@ class instance_halls_of_reflection : public InstanceMapScript
struct instance_halls_of_reflection_InstanceMapScript : public InstanceScript
{
instance_halls_of_reflection_InstanceMapScript(Map* map) : InstanceScript(map)
instance_halls_of_reflection_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

2
src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
View File

@@ -63,7 +63,7 @@ class instance_gundrak : public InstanceMapScript
struct instance_gundrak_InstanceMapScript : public InstanceScript
{
instance_gundrak_InstanceMapScript(Map* map) : InstanceScript(map)
instance_gundrak_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

2
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
View File

@@ -114,7 +114,7 @@ class instance_naxxramas : public InstanceMapScript
struct instance_naxxramas_InstanceMapScript : public InstanceScript
{
instance_naxxramas_InstanceMapScript(Map* map) : InstanceScript(map)
instance_naxxramas_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

2
src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
View File

@@ -42,7 +42,7 @@ public:
struct instance_eye_of_eternity_InstanceMapScript : public InstanceScript
{
instance_eye_of_eternity_InstanceMapScript(Map* map) : InstanceScript(map)
instance_eye_of_eternity_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);

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

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

2
src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
View File

@@ -43,7 +43,7 @@ class instance_oculus : public InstanceMapScript
struct instance_oculus_InstanceMapScript : public InstanceScript
{
instance_oculus_InstanceMapScript(Map* map) : InstanceScript(map)
instance_oculus_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

2
src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
View File

@@ -37,7 +37,7 @@ class instance_halls_of_lightning : public InstanceMapScript
struct instance_halls_of_lightning_InstanceMapScript : public InstanceScript
{
instance_halls_of_lightning_InstanceMapScript(Map* map) : InstanceScript(map)
instance_halls_of_lightning_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

2
src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
View File

@@ -36,7 +36,7 @@ class instance_halls_of_stone : public InstanceMapScript
struct instance_halls_of_stone_InstanceMapScript : public InstanceScript
{
instance_halls_of_stone_InstanceMapScript(Map* map) : InstanceScript(map)
instance_halls_of_stone_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

3
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
View File

@@ -19,7 +19,6 @@
#include "Creature.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Map.h"
#include "utgarde_keep.h"
DoorData const doorData[] =
@@ -42,7 +41,7 @@ class instance_utgarde_keep : public InstanceMapScript
struct instance_utgarde_keep_InstanceMapScript : public InstanceScript
{
instance_utgarde_keep_InstanceMapScript(Map* map) : InstanceScript(map)
instance_utgarde_keep_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

3
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
View File

@@ -19,7 +19,6 @@
#include "AreaBoundary.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Map.h"
#include "utgarde_pinnacle.h"
BossBoundaryData const boundaries =
@@ -64,7 +63,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript
struct instance_utgarde_pinnacle_InstanceMapScript : public InstanceScript
{
instance_utgarde_pinnacle_InstanceMapScript(Map* map) : InstanceScript(map)
instance_utgarde_pinnacle_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

3
src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
View File

@@ -18,7 +18,6 @@
#include "ScriptMgr.h"
#include "GameTime.h"
#include "InstanceScript.h"
#include "Map.h"
#include "vault_of_archavon.h"
/* Vault of Archavon encounters:
@@ -44,7 +43,7 @@ class instance_vault_of_archavon : public InstanceMapScript
struct instance_vault_of_archavon_InstanceMapScript : public InstanceScript
{
instance_vault_of_archavon_InstanceMapScript(Map* map) : InstanceScript(map)
instance_vault_of_archavon_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);

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

@@ -195,7 +195,7 @@ class instance_violet_hold : public InstanceMapScript
struct instance_violet_hold_InstanceMapScript : public InstanceScript
{
instance_violet_hold_InstanceMapScript(Map* map) : InstanceScript(map)
instance_violet_hold_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);