From a57bf5a78bbfd91325bbd1b85e5932b414ab57bd Mon Sep 17 00:00:00 2001 From: tomrus88 Date: Fri, 29 May 2009 19:23:28 +0400 Subject: [PATCH] Applied coding style. --- contrib/vmap_extractor_v2/vmapextract/adtfile.cpp | 1 + src/game/ItemHandler.cpp | 2 +- src/game/MovementHandler.cpp | 2 +- src/game/QuestHandler.cpp | 6 +++--- src/game/SpellAuras.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp b/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp index cd9ba7219..49717c047 100644 --- a/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp +++ b/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp @@ -1,6 +1,7 @@ #include "adtfile.h" #include + char * GetPlainName(char * FileName) { char * szTemp; diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp index f65ff661c..3c69a0b6c 100644 --- a/src/game/ItemHandler.cpp +++ b/src/game/ItemHandler.cpp @@ -439,7 +439,7 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data ) data << pProto->ArmorDamageModifier; data << pProto->Duration; // added in 2.4.2.8209, duration (seconds) data << pProto->ItemLimitCategory; // WotLK, ItemLimitCategory - data << uint32(0); // Holiday.dbc? + data << pProto->HolidayId; // Holiday.dbc? SendPacket( &data ); } else diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index c93c1cccd..a3fabb545 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -336,7 +336,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data ) { if(Map *map = mover->GetMap()) map->CreatureRelocation((Creature*)mover, movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o); - //mover->SetUnitMovementFlags(movementInfo.flags); + mover->SetUnitMovementFlags(movementInfo.flags); } } diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index 84458a33f..b9baa025a 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -120,7 +120,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data ) if(!GetPlayer()->isAlive()) return; - sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_ACCEPT_QUEST npc = %u, quest = %u, unk1 = %u",uint32(GUID_LOPART(guid)), quest, unk1 ); + sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_ACCEPT_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), quest, unk1 ); Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM|TYPEMASK_PLAYER); @@ -213,7 +213,7 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode( WorldPacket & recv_data ) uint32 quest; uint8 unk1; recv_data >> guid >> quest >> unk1; - sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_QUERY_QUEST npc = %u, quest = %u, unk1 = %u",uint32(GUID_LOPART(guid)), quest, unk1 ); + sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_QUERY_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), quest, unk1 ); // Verify that the guid is valid and is a questgiver or involved in the requested quest Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM); @@ -232,7 +232,7 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode( WorldPacket & recv_data ) void WorldSession::HandleQuestQueryOpcode( WorldPacket & recv_data ) { - CHECK_PACKET_SIZE(recv_data,4); + CHECK_PACKET_SIZE(recv_data, 4); uint32 quest; recv_data >> quest; diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 2b4ce206d..d35360472 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -3414,7 +3414,7 @@ void Aura::HandleAuraModStun(bool apply, bool Real) if(m_target->GetTypeId() != TYPEID_PLAYER) ((Creature*)m_target)->StopMoving(); else - ((Player*)m_target)->m_movementInfo.flags = 0; // Clear movement flags + ((Player*)m_target)->m_movementInfo.flags = 0; // Clear movement flags WorldPacket data(SMSG_FORCE_MOVE_ROOT, 8); data.append(m_target->GetPackGUID());