From 3bfe4bbd3bb883449ddaa4633d1bed48a35d2f41 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Fri, 11 Feb 2011 18:10:51 +0300 Subject: [PATCH] [11134] Make GCC happy and restore build at *nix. --- src/game/Creature.cpp | 3 ++- src/game/GameObject.cpp | 3 ++- src/game/MapManager.h | 1 - src/shared/revision_nr.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index d2b65acab..ae9a6b421 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1374,7 +1374,8 @@ void Creature::DeleteFromDB() return; } - sMapPersistentStateMgr.DoForAllStatesWithMapId(GetMapId(), CreatureRespawnDeleteWorker(m_DBTableGuid)); + CreatureRespawnDeleteWorker worker (m_DBTableGuid); + sMapPersistentStateMgr.DoForAllStatesWithMapId(GetMapId(), worker); sObjectMgr.DeleteCreatureData(m_DBTableGuid); diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 7012e4b4b..2b0d13ef2 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -639,7 +639,8 @@ void GameObject::DeleteFromDB() return; } - sMapPersistentStateMgr.DoForAllStatesWithMapId(GetMapId(), GameObjectRespawnDeleteWorker(m_DBTableGuid)); + GameObjectRespawnDeleteWorker worker(m_DBTableGuid); + sMapPersistentStateMgr.DoForAllStatesWithMapId(GetMapId(), worker); sObjectMgr.DeleteGOData(m_DBTableGuid); WorldDatabase.PExecuteLog("DELETE FROM gameobject WHERE guid = '%u'", m_DBTableGuid); diff --git a/src/game/MapManager.h b/src/game/MapManager.h index d920d988c..1854bd832 100644 --- a/src/game/MapManager.h +++ b/src/game/MapManager.h @@ -188,7 +188,6 @@ inline void MapManager::DoForAllMapsWithMapId(uint32 mapId, Do& _do) _do(itr->second); } - #define sMapMgr MapManager::Instance() #endif diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index cf2896320..2c811c6b3 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 "11133" + #define REVISION_NR "11134" #endif // __REVISION_NR_H__