diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Creature.cpp | 2 | ||||
| -rw-r--r-- | src/game/InstanceData.cpp | 2 | ||||
| -rw-r--r-- | src/game/InstanceData.h | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 1c905de68b8..01f43ac8163 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1387,7 +1387,7 @@ bool Creature::CreateFromProto(uint32 guidlow, uint32 Entry, uint32 team, const Map *map = FindMap(); if(map && map->IsDungeon() && ((InstanceMap*)map)->GetInstanceData()) { - ((InstanceMap*)map)->GetInstanceData()->OnCreatureCreate(this); + ((InstanceMap*)map)->GetInstanceData()->OnCreatureCreate(this, true); } return true; diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp index 41369d536e1..92e4b4afe3d 100644 --- a/src/game/InstanceData.cpp +++ b/src/game/InstanceData.cpp @@ -54,7 +54,7 @@ bool InstanceData::IsEncounterInProgress() const //This will be removed in the future, just compitiable with Mangos void InstanceData::OnCreatureCreate(Creature *creature, bool add) { - OnCreatureCreate(creature, creature->GetEntry(), add); + OnCreatureCreate(creature, creature->GetEntry()); } void InstanceData::SetBossRoomDoor(uint32 id, GameObject *door, bool add) diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h index 097ba28d449..2d7e5f84746 100644 --- a/src/game/InstanceData.h +++ b/src/game/InstanceData.h @@ -80,11 +80,15 @@ class TRINITY_DLL_SPEC InstanceData virtual void OnPlayerEnter(Player *) {} //Called when a gameobject is created - virtual void OnObjectCreate(GameObject *, bool add = true) {} + virtual void OnObjectCreate(GameObject *go, bool add) + { + OnObjectCreate(go); + } + virtual void OnObjectCreate(GameObject *) {} //called on creature creation - virtual void OnCreatureCreate(Creature *, bool add = true); - virtual void OnCreatureCreate(Creature *, uint32 entry, bool add = true) {} + virtual void OnCreatureCreate(Creature *, bool add); + virtual void OnCreatureCreate(Creature *, uint32 entry) {} //All-purpose data storage 64 bit virtual uint64 GetData64(uint32 /*Data*/) { return 0; } |