From a598fb5312b1cae60757f32b8c9170d0fcd1b417 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sat, 12 Feb 2011 10:34:23 +0300 Subject: [PATCH] [11150] Enable GameEvent system full features for instanceable maps. --- src/game/GameEventMgr.cpp | 14 ++------------ src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index 3225dc074..51f0bd39b 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -710,12 +710,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) sObjectMgr.AddCreatureToGrid(*itr, data); - // FIXME: gameevent system can't work correctly in instanceable maps while object sin instances use dynamic guids - // Current code prevent wrong way work until switch to use static guids for instance objects - MapEntry const* mapEntry = sMapStore.LookupEntry(data->mapid); - - if (mapEntry && !mapEntry->Instanceable()) - Creature::SpawnInMaps(*itr, data); + Creature::SpawnInMaps(*itr, data); } } @@ -745,12 +740,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) sObjectMgr.AddGameobjectToGrid(*itr, data); - // FIXME: gameevent system can't work correctly in instanceable maps while object sin instances use dynamic guids - // Current code prevent wrong way work until switch to use static guids for instance objects - MapEntry const* mapEntry = sMapStore.LookupEntry(data->mapid); - - if (mapEntry && !mapEntry->Instanceable()) - GameObject::SpawnInMaps(*itr, data); + GameObject::SpawnInMaps(*itr, data); } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 706d7d565..8cf1fd134 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11149" + #define REVISION_NR "11150" #endif // __REVISION_NR_H__