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

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