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

This commit is contained in:
Ovahlord committed 2018-07-28 02:00:24 +02:00
1 parent 92ef398f56
commit 78ed8acdcc
73 files changed
+74 -98

No files matched your search

@@ -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);
@@ -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);