Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

warning fixes and partial revert

Browse Source
This commit is contained in:
Aokromes
2016-08-21 02:28:29 +02:00
parent 3792e4ea75
commit d297f013f1
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/Object/Object.cpp
View File

@@ -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);

2
src/server/game/Entities/Object/Updates/UpdateData.h
View File

@@ -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,

6
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -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;
}