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

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