diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2017-07-31 21:23:26 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2017-07-31 21:23:26 +0200 |
| commit | 232db9777a3425891f55b5b94a02fa619adafcb5 (patch) | |
| tree | 558af5bb20ba40d7dcdbbf06a5b4e9eddf0b2664 /src/server/game/Scripting/ScriptMgr.h | |
| parent | d24ce1739a799042d5a164794c09674227c8572c (diff) | |
| parent | 59db2eeea0a35028779fd76372ae06cc98c8086f (diff) | |
Merge remote-tracking branch 'base/dynamic_spawning' into 3.3.5 (PR #19056).
IT'S HAPPENING.
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.h')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index dab3b42329c..65c5be6be37 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -907,7 +907,7 @@ class TC_GAME_API ScriptMgr public: /* CreatureScript */ - bool CanSpawn(ObjectGuid::LowType spawnId, uint32 entry, CreatureTemplate const* actTemplate, CreatureData const* cData, Map const* map); + bool CanSpawn(ObjectGuid::LowType spawnId, uint32 entry, CreatureData const* cData, Map const* map); CreatureAI* GetCreatureAI(Creature* creature); public: /* GameObjectScript */ |