aboutsummaryrefslogtreecommitdiff
path: root/src/game/MapInstanced.h
diff options
context:
space:
mode:
authorn0n4m3 <none@none>2009-12-17 11:30:18 +0100
committern0n4m3 <none@none>2009-12-17 11:30:18 +0100
commit9f45beb67e2e8bcc54b18bea9b1eb022f166e7b5 (patch)
tree8f58d01282bd26c9c32e15f561da24b621f10259 /src/game/MapInstanced.h
parent360edd11df3911567000d5e150f3ede22af112f5 (diff)
Update Map for 322a and new instance system
--HG-- branch : trunk
Diffstat (limited to 'src/game/MapInstanced.h')
-rw-r--r--src/game/MapInstanced.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/MapInstanced.h b/src/game/MapInstanced.h
index 22622d362ce..90aa5f5508e 100644
--- a/src/game/MapInstanced.h
+++ b/src/game/MapInstanced.h
@@ -23,6 +23,7 @@
#include "Map.h"
#include "InstanceSaveMgr.h"
+#include "DBCEnums.h"
class TRINITY_DLL_DECL MapInstanced : public Map
{
@@ -41,7 +42,7 @@ class TRINITY_DLL_DECL MapInstanced : public Map
void UnloadAll();
bool CanEnter(Player* player);
- Map* CreateInstance(const uint32 mapId, Player * player, uint32 instanceId);
+ Map* CreateInstance(const uint32 mapId, Player * player);
Map* FindMap(uint32 InstanceId) const { return _FindMap(InstanceId); }
bool DestroyInstance(InstancedMaps::iterator &itr);
@@ -63,8 +64,8 @@ class TRINITY_DLL_DECL MapInstanced : public Map
private:
- InstanceMap* CreateInstance(uint32 InstanceId, InstanceSave *save, uint8 difficulty);
- BattleGroundMap* CreateBattleGround(uint32 InstanceId);
+ InstanceMap* CreateInstance(uint32 InstanceId, InstanceSave *save, Difficulty difficulty);
+ BattleGroundMap* CreateBattleGround(uint32 InstanceId, BattleGround* bg);
InstancedMaps m_InstancedMaps;
@@ -77,4 +78,3 @@ class TRINITY_DLL_DECL MapInstanced : public Map
uint16 GridMapReference[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS];
};
#endif
-