From dd8f301e16f45cc1028cf40cbce4baf04c9e044f Mon Sep 17 00:00:00 2001 From: DDuarte Date: Sun, 19 Jul 2015 01:55:12 +0100 Subject: Core/Globals: Rename AddCreData -> AddCreatureData and MoveCreData -> MoveCreatureData (cherry picked from commit 5ceb3fd0ab3644f9515e11dea36f7b00316e4136) Conflicts: src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h src/server/game/OutdoorPvP/OutdoorPvP.cpp --- src/server/game/Globals/ObjectMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Globals/ObjectMgr.cpp') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index a4a12215c05..2b1fd4187b8 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1942,7 +1942,7 @@ ObjectGuid::LowType ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, fl return guid; } -ObjectGuid::LowType ObjectMgr::AddCreData(uint32 entry, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay /*= 0*/) +ObjectGuid::LowType ObjectMgr::AddCreatureData(uint32 entry, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay /*= 0*/) { CreatureTemplate const* cInfo = GetCreatureTemplate(entry); if (!cInfo) -- cgit v1.2.3