diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-12-06 12:01:51 +0100 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-12-06 12:01:51 +0100 |
| commit | fe69bd654a424f560f37774d5c3e763fd6589607 (patch) | |
| tree | 0f4a8ef0e26a0aabfea98d5800076003ee11ce3e /src/server/game/Events/GameEventMgr.cpp | |
| parent | b0d106944b155babf22dd1837da2017180589b0c (diff) | |
| parent | 15c24a4e971e2808976d9844a60767442b51ae5e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
Conflicts:
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.cpp
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
| -rwxr-xr-x | src/server/game/Events/GameEventMgr.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index dbcb07e88f5..d3cc27c9e6c 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1176,10 +1176,8 @@ void GameEventMgr::GameEventSpawn(int16 event_id) { Creature* creature = new Creature; //sLog->outDebug("Spawning creature %u", *itr); - if (!creature->LoadFromDB(*itr, map)) + if (!creature->LoadCreatureFromDB(*itr, map)) delete creature; - else - map->AddToMap(creature); } } } @@ -1205,7 +1203,8 @@ void GameEventMgr::GameEventSpawn(int16 event_id) { GameObject* pGameobject = new GameObject; //sLog->outDebug("Spawning gameobject %u", *itr); - if (!pGameobject->LoadFromDB(*itr, map)) + //TODO: find out when it is add to map + if (!pGameobject->LoadGameObjectFromDB(*itr, map, false)) delete pGameobject; else { |