mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-02 11:10:26 +00:00
Warning fixes, general cleanup (#5053)
This commit is contained in:
+49
-29
@@ -28,8 +28,15 @@
|
||||
#include "common/emu_opcodes.h"
|
||||
#endif
|
||||
|
||||
class EQPacket : public BasePacket {
|
||||
class EQPacket : public BasePacket
|
||||
{
|
||||
friend class EQStream;
|
||||
|
||||
protected:
|
||||
EQPacket();
|
||||
EQPacket(EmuOpcode opcode, const unsigned char* buf, size_t len);
|
||||
EQPacket(EmuOpcode opcode, SerializeBuffer&& buf);
|
||||
|
||||
public:
|
||||
virtual ~EQPacket() {}
|
||||
|
||||
@@ -41,19 +48,12 @@ public:
|
||||
virtual void DumpRawHeaderNoTime(uint16 seq=0xffff, FILE *to = stdout) const;
|
||||
|
||||
void SetOpcode(EmuOpcode op) { emu_opcode = op; }
|
||||
const EmuOpcode GetOpcode() const { return(emu_opcode); }
|
||||
// const char *GetOpcodeName() const;
|
||||
EmuOpcode GetOpcode() const { return(emu_opcode); }
|
||||
|
||||
protected:
|
||||
//this is just a cache so we dont look it up several times on Get()
|
||||
//and it is mutable so we can store the cached copy even on a const object
|
||||
EmuOpcode emu_opcode;
|
||||
|
||||
EQPacket(EmuOpcode opcode, const unsigned char *buf, const uint32 len);
|
||||
EQPacket(EmuOpcode opcode, SerializeBuffer &buf) : BasePacket(buf), emu_opcode(opcode) { };
|
||||
// EQPacket(const EQPacket &p) { }
|
||||
EQPacket() { emu_opcode=OP_Unknown; pBuffer=nullptr; size=0; }
|
||||
|
||||
EmuOpcode emu_opcode = OP_Unknown;
|
||||
};
|
||||
|
||||
class EQRawApplicationPacket;
|
||||
@@ -90,19 +90,43 @@ protected:
|
||||
uint16 opcode;
|
||||
};
|
||||
|
||||
class EQApplicationPacket : public EQPacket {
|
||||
class EQApplicationPacket : public EQPacket
|
||||
{
|
||||
friend class EQStream;
|
||||
|
||||
public:
|
||||
EQApplicationPacket()
|
||||
{
|
||||
}
|
||||
|
||||
EQApplicationPacket(EmuOpcode op)
|
||||
: EQPacket(op, nullptr, 0)
|
||||
{
|
||||
}
|
||||
|
||||
EQApplicationPacket(EmuOpcode op, size_t len)
|
||||
: EQPacket(op, nullptr, len)
|
||||
{
|
||||
}
|
||||
EQApplicationPacket(EmuOpcode op, const unsigned char* buf, size_t len)
|
||||
: EQPacket(op, buf, len)
|
||||
{
|
||||
}
|
||||
|
||||
EQApplicationPacket(EmuOpcode op, SerializeBuffer&& buf)
|
||||
: EQPacket(op, std::move(buf))
|
||||
{
|
||||
}
|
||||
|
||||
private:
|
||||
EQApplicationPacket(const EQApplicationPacket& p)
|
||||
: EQPacket(p.emu_opcode, p.pBuffer, p.size)
|
||||
, app_opcode_size(p.app_opcode_size)
|
||||
, opcode_bypass(p.opcode_bypass)
|
||||
{
|
||||
}
|
||||
|
||||
public:
|
||||
EQApplicationPacket() : EQPacket(OP_Unknown, nullptr, 0), opcode_bypass(0)
|
||||
{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
|
||||
EQApplicationPacket(const EmuOpcode op) : EQPacket(op, nullptr, 0), opcode_bypass(0)
|
||||
{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
|
||||
EQApplicationPacket(const EmuOpcode op, const uint32 len) : EQPacket(op, nullptr, len), opcode_bypass(0)
|
||||
{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
|
||||
EQApplicationPacket(const EmuOpcode op, const unsigned char *buf, const uint32 len) : EQPacket(op, buf, len), opcode_bypass(0)
|
||||
{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
|
||||
EQApplicationPacket(const EmuOpcode op, SerializeBuffer &buf) : EQPacket(op, buf), opcode_bypass(0)
|
||||
{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
|
||||
bool combine(const EQApplicationPacket *rhs);
|
||||
uint32 serialize (uint16 opcode, unsigned char *dest) const;
|
||||
uint32 Size() const { return size+app_opcode_size; }
|
||||
@@ -119,15 +143,11 @@ public:
|
||||
|
||||
uint16 GetProtocolOpcode() const { return protocol_opcode; }
|
||||
void SetProtocolOpcode(uint16 v) { protocol_opcode = v; }
|
||||
|
||||
protected:
|
||||
|
||||
uint16 protocol_opcode;
|
||||
uint8 app_opcode_size;
|
||||
uint16 opcode_bypass;
|
||||
private:
|
||||
|
||||
EQApplicationPacket(const EQApplicationPacket &p) : EQPacket(p.emu_opcode, p.pBuffer, p.size), opcode_bypass(p.opcode_bypass) { app_opcode_size = p.app_opcode_size; }
|
||||
|
||||
uint16 protocol_opcode = 0;
|
||||
uint8 app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2;
|
||||
uint16 opcode_bypass = 0;
|
||||
};
|
||||
|
||||
class EQRawApplicationPacket : public EQApplicationPacket {
|
||||
|
||||
Reference in New Issue
Block a user