diff options
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Memory.h | 2 | ||||
| -rw-r--r-- | src/server/shared/Packets/WorldPacket.h | 70 |
2 files changed, 1 insertions, 71 deletions
diff --git a/src/server/shared/Memory.h b/src/server/shared/Memory.h index 25533638915..7aeb4dc3f0a 100644 --- a/src/server/shared/Memory.h +++ b/src/server/shared/Memory.h @@ -6,7 +6,7 @@ #include "DetourAlloc.h" // memory management -inline void* dtCustomAlloc(int size, dtAllocHint /*hint*/) +inline void* dtCustomAlloc(size_t size, dtAllocHint /*hint*/) { return (void*)new unsigned char[size]; } diff --git a/src/server/shared/Packets/WorldPacket.h b/src/server/shared/Packets/WorldPacket.h deleted file mode 100644 index 191dd084766..00000000000 --- a/src/server/shared/Packets/WorldPacket.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> - * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef TRINITYCORE_WORLDPACKET_H -#define TRINITYCORE_WORLDPACKET_H - -#include "Common.h" -#include "ByteBuffer.h" - -class WorldPacket : public ByteBuffer -{ - public: - // just container for later use - WorldPacket() : ByteBuffer(0), m_opcode(0) - { - } - - explicit WorldPacket(uint16 opcode, size_t res=200) : ByteBuffer(res), m_opcode(opcode) { } - - WorldPacket(WorldPacket&& packet) : ByteBuffer(std::move(packet)), m_opcode(packet.m_opcode) - { - } - - WorldPacket(WorldPacket const& right) : ByteBuffer(right), m_opcode(right.m_opcode) - { - } - - WorldPacket& operator=(WorldPacket const& right) - { - if (this != &right) - { - m_opcode = right.m_opcode; - ByteBuffer::operator =(right); - } - - return *this; - } - - WorldPacket(uint16 opcode, MessageBuffer&& buffer) : ByteBuffer(std::move(buffer)), m_opcode(opcode) { } - - void Initialize(uint16 opcode, size_t newres=200) - { - clear(); - _storage.reserve(newres); - m_opcode = opcode; - } - - uint16 GetOpcode() const { return m_opcode; } - void SetOpcode(uint16 opcode) { m_opcode = opcode; } - - protected: - uint16 m_opcode; -}; - -#endif |