From d297f013f1ed45afff970eff8cee502a1703d51e Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 21 Aug 2016 02:28:29 +0200 Subject: [PATCH] warning fixes and partial revert --- src/server/game/Entities/Object/Object.cpp | 4 ++-- src/server/game/Entities/Object/Updates/UpdateData.h | 2 +- src/server/game/Globals/ObjectMgr.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 7ed5ca85d7e..4afccb2d79c 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -199,7 +199,7 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c { if (!(flags & UPDATEFLAG_LIVING)) if (!worldObject->m_movementInfo.transport.guid.IsEmpty()) - flags |= UPDATEFLAG_TRANSPORT_POSITION; + flags |= UPDATEFLAG_STATIONARY_POSITION; if (worldObject->GetAIAnimKitId() || worldObject->GetMovementAnimKitId() || worldObject->GetMeleeAnimKitId()) flags |= UPDATEFLAG_ANIMKITS; @@ -369,7 +369,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const data->WriteBit(flags & UPDATEFLAG_LIVING); data->WriteBits(stopFrameCount, 24); data->WriteBit(0); - data->WriteBit(flags & UPDATEFLAG_TRANSPORT_POSITION); + data->WriteBit(flags & UPDATEFLAG_GO_TRANSPORT_POSITION); data->WriteBit(flags & UPDATEFLAG_STATIONARY_POSITION); data->WriteBit(flags & UPDATEFLAG_UNK5); data->WriteBit(0); diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index 2c716bc6944..9ca25fe9cb3 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -42,7 +42,7 @@ enum OBJECT_UPDATE_FLAGS UPDATEFLAG_UNKNOWN = 0x0008, UPDATEFLAG_LOWGUID = 0x0010, UPDATEFLAG_LIVING = 0x0020, - UPDATEFLAG_TRANSPORT_POSITION = 0x0040, + UPDATEFLAG_STATIONARY_POSITION = 0x0040, UPDATEFLAG_VEHICLE = 0x0080, UPDATEFLAG_GO_TRANSPORT_POSITION = 0x0100, UPDATEFLAG_ROTATION = 0x0200, diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index c88bfe8792f..e0a892b67e3 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1135,19 +1135,19 @@ void ObjectMgr::LoadCreatureAddons() if (creatureAddon.aiAnimKit && !sAnimKitStore.LookupEntry(creatureAddon.aiAnimKit)) { - TC_LOG_ERROR("sql.sql", "Creature (GUID: " UI64FMTD ") has invalid aiAnimKit (%u) defined in `creature_addon`.", guid, creatureAddon.aiAnimKit); + TC_LOG_ERROR("sql.sql", "Creature (GUID: " %u ") has invalid aiAnimKit (%u) defined in `creature_addon`.", guid, creatureAddon.aiAnimKit); creatureAddon.aiAnimKit = 0; } if (creatureAddon.movementAnimKit && !sAnimKitStore.LookupEntry(creatureAddon.movementAnimKit)) { - TC_LOG_ERROR("sql.sql", "Creature (GUID: " UI64FMTD ") has invalid movementAnimKit (%u) defined in `creature_addon`.", guid, creatureAddon.movementAnimKit); + TC_LOG_ERROR("sql.sql", "Creature (GUID: " %u ") has invalid movementAnimKit (%u) defined in `creature_addon`.", guid, creatureAddon.movementAnimKit); creatureAddon.movementAnimKit = 0; } if (creatureAddon.meleeAnimKit && !sAnimKitStore.LookupEntry(creatureAddon.meleeAnimKit)) { - TC_LOG_ERROR("sql.sql", "Creature (GUID: " UI64FMTD ") has invalid meleeAnimKit (%u) defined in `creature_addon`.", guid, creatureAddon.meleeAnimKit); + TC_LOG_ERROR("sql.sql", "Creature (GUID: " %u ") has invalid meleeAnimKit (%u) defined in `creature_addon`.", guid, creatureAddon.meleeAnimKit); creatureAddon.meleeAnimKit = 0; }