mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 01:37:00 +00:00
Small code cleanup and partial merge with dev branch
This commit is contained in:
parent
3c7c5ba8d4
commit
28dc20c6e2
18 changed files with 371 additions and 468 deletions
|
|
@ -35,7 +35,6 @@
|
|||
#include "WorldPacket.h"
|
||||
#include "SharedDefines.h"
|
||||
#include "ByteBuffer.h"
|
||||
#include "AddonHandler.h"
|
||||
#include "Opcodes.h"
|
||||
#include "Database/DatabaseEnv.h"
|
||||
#include "Auth/Sha1.h"
|
||||
|
|
@ -187,7 +186,7 @@ int WorldSocket::SendPacket (const WorldPacket& pct)
|
|||
}
|
||||
|
||||
ServerPktHeader header(pct.size()+2, pct.GetOpcode());
|
||||
m_Crypt.EncryptSend ( header.header, header.getHeaderLength());
|
||||
m_Crypt.EncryptSend ((uint8*)header.header, header.getHeaderLength());
|
||||
|
||||
if (m_OutBuffer->space () >= pct.size () + header.getHeaderLength() && msg_queue()->is_empty())
|
||||
{
|
||||
|
|
@ -480,7 +479,7 @@ int WorldSocket::handle_input_header (void)
|
|||
|
||||
ACE_ASSERT (m_Header.length () == sizeof (ClientPktHeader));
|
||||
|
||||
m_Crypt.DecryptRecv ((ACE_UINT8*) m_Header.rd_ptr (), sizeof (ClientPktHeader));
|
||||
m_Crypt.DecryptRecv ((uint8*) m_Header.rd_ptr (), sizeof (ClientPktHeader));
|
||||
|
||||
ClientPktHeader& header = *((ClientPktHeader*) m_Header.rd_ptr ());
|
||||
|
||||
|
|
@ -993,10 +992,6 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
|
|||
|
||||
sWorld.AddSession (m_Session);
|
||||
|
||||
// Create and send the Addon packet
|
||||
if (sAddOnHandler.BuildAddonPacket (&recvPacket, &SendAddonPacked))
|
||||
SendPacket (SendAddonPacked);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue