josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix broken instance scripts.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-06 17:52:45 -05:00
parent c228f62a07
commit 1b460da5cb
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Creature.cpp
+1 -1
View File
@@ -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;
src/game/InstanceData.cpp
+1 -1
View File
@@ -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)
src/game/InstanceData.h
+7 -3
View File
@@ -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; }