diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-07-19 01:55:12 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-19 01:55:12 +0100 |
| commit | dd8f301e16f45cc1028cf40cbce4baf04c9e044f (patch) | |
| tree | ea4bb0395b77631d2e039ee1d87651d5e0bfe058 /src/server/game/Globals/ObjectMgr.h | |
| parent | 167f66a4c763bdaedec7f94f69a0f1d0688fa985 (diff) | |
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
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 901aa56b431..3262477982d 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -1222,7 +1222,7 @@ class ObjectMgr void AddGameobjectToGrid(ObjectGuid::LowType guid, GameObjectData const* data); void RemoveGameobjectFromGrid(ObjectGuid::LowType guid, GameObjectData const* data); ObjectGuid::LowType AddGOData(uint32 entry, uint32 map, float x, float y, float z, float o, uint32 spawntimedelay = 0, float rotation0 = 0, float rotation1 = 0, float rotation2 = 0, float rotation3 = 0); - ObjectGuid::LowType AddCreData(uint32 entry, uint32 map, float x, float y, float z, float o, uint32 spawntimedelay = 0); + ObjectGuid::LowType AddCreatureData(uint32 entry, uint32 map, float x, float y, float z, float o, uint32 spawntimedelay = 0); // reserved names void LoadReservedPlayersNames(); |