mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 07:37:01 +00:00
Applied coding style.
This commit is contained in:
parent
e454cb693d
commit
a57bf5a78b
5 changed files with 7 additions and 6 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
#include "adtfile.h"
|
#include "adtfile.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
char * GetPlainName(char * FileName)
|
char * GetPlainName(char * FileName)
|
||||||
{
|
{
|
||||||
char * szTemp;
|
char * szTemp;
|
||||||
|
|
|
||||||
|
|
@ -439,7 +439,7 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
|
||||||
data << pProto->ArmorDamageModifier;
|
data << pProto->ArmorDamageModifier;
|
||||||
data << pProto->Duration; // added in 2.4.2.8209, duration (seconds)
|
data << pProto->Duration; // added in 2.4.2.8209, duration (seconds)
|
||||||
data << pProto->ItemLimitCategory; // WotLK, ItemLimitCategory
|
data << pProto->ItemLimitCategory; // WotLK, ItemLimitCategory
|
||||||
data << uint32(0); // Holiday.dbc?
|
data << pProto->HolidayId; // Holiday.dbc?
|
||||||
SendPacket( &data );
|
SendPacket( &data );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -336,7 +336,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
|
||||||
{
|
{
|
||||||
if(Map *map = mover->GetMap())
|
if(Map *map = mover->GetMap())
|
||||||
map->CreatureRelocation((Creature*)mover, movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
|
map->CreatureRelocation((Creature*)mover, movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
|
||||||
//mover->SetUnitMovementFlags(movementInfo.flags);
|
mover->SetUnitMovementFlags(movementInfo.flags);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data )
|
||||||
if(!GetPlayer()->isAlive())
|
if(!GetPlayer()->isAlive())
|
||||||
return;
|
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);
|
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;
|
uint32 quest;
|
||||||
uint8 unk1;
|
uint8 unk1;
|
||||||
recv_data >> guid >> quest >> 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
|
// 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);
|
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 )
|
void WorldSession::HandleQuestQueryOpcode( WorldPacket & recv_data )
|
||||||
{
|
{
|
||||||
CHECK_PACKET_SIZE(recv_data,4);
|
CHECK_PACKET_SIZE(recv_data, 4);
|
||||||
|
|
||||||
uint32 quest;
|
uint32 quest;
|
||||||
recv_data >> quest;
|
recv_data >> quest;
|
||||||
|
|
|
||||||
|
|
@ -3414,7 +3414,7 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
|
||||||
if(m_target->GetTypeId() != TYPEID_PLAYER)
|
if(m_target->GetTypeId() != TYPEID_PLAYER)
|
||||||
((Creature*)m_target)->StopMoving();
|
((Creature*)m_target)->StopMoving();
|
||||||
else
|
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);
|
WorldPacket data(SMSG_FORCE_MOVE_ROOT, 8);
|
||||||
data.append(m_target->GetPackGUID());
|
data.append(m_target->GetPackGUID());
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue