diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Protocol/Protocol132.h | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h index 144d560fd..1124a7253 100644 --- a/src/Protocol/Protocol132.h +++ b/src/Protocol/Protocol132.h @@ -41,35 +41,35 @@ public: virtual ~cProtocol132(); /// Called when client sends some data: - virtual void DataReceived(const char * a_Data, size_t a_Size) /*override*/; + virtual void DataReceived(const char * a_Data, size_t a_Size) override; // Sending commands (alphabetically sorted): - virtual void SendBlockAction (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) /*override*/; - virtual void SendBlockBreakAnim (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) /*override*/; - virtual void SendBlockChange (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/; - virtual void SendChunkData (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) /*override*/; - virtual void SendCollectEntity (const cEntity & a_Entity, const cPlayer & a_Player) /*override*/; - virtual void SendDestroyEntity (const cEntity & a_Entity) /*override*/; - virtual void SendEntityEquipment (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) /*override*/; - virtual void SendLogin (const cPlayer & a_Player, const cWorld & a_World) /*override*/; - virtual void SendPlayerSpawn (const cPlayer & a_Player) /*override*/; - virtual void SendSoundEffect (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) /*override*/; - virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) /*override*/; - virtual void SendSpawnMob (const cMonster & a_Mob) /*override*/; - virtual void SendTabCompletionResults(const AStringVector & a_Results) /*override*/; - virtual void SendUnloadChunk (int a_ChunkX, int a_ChunkZ) /*override*/; - virtual void SendWholeInventory (const cWindow & a_Window) /*override*/; - - virtual AString GetAuthServerID(void) /*override*/; + virtual void SendBlockAction (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override; + virtual void SendBlockBreakAnim (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override; + virtual void SendBlockChange (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override; + virtual void SendChunkData (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override; + virtual void SendCollectEntity (const cEntity & a_Entity, const cPlayer & a_Player) override; + virtual void SendDestroyEntity (const cEntity & a_Entity) override; + virtual void SendEntityEquipment (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override; + virtual void SendLogin (const cPlayer & a_Player, const cWorld & a_World) override; + virtual void SendPlayerSpawn (const cPlayer & a_Player) override; + virtual void SendSoundEffect (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) override; + virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override; + virtual void SendSpawnMob (const cMonster & a_Mob) override; + virtual void SendTabCompletionResults(const AStringVector & a_Results) override; + virtual void SendUnloadChunk (int a_ChunkX, int a_ChunkZ) override; + virtual void SendWholeInventory (const cWindow & a_Window) override; + + virtual AString GetAuthServerID(void) override; /// Handling of the additional packets: - virtual int ParsePacket(unsigned char a_PacketType) /*override*/; + virtual int ParsePacket(unsigned char a_PacketType) override; // Modified packets: - virtual int ParseBlockPlace (void) /*override*/; - virtual int ParseHandshake (void) /*override*/; - virtual int ParseLogin (void) /*override*/; - virtual int ParsePlayerAbilities(void) /*override*/; + virtual int ParseBlockPlace (void) override; + virtual int ParseHandshake (void) override; + virtual int ParseLogin (void) override; + virtual int ParsePlayerAbilities(void) override; // New packets: virtual int ParseClientStatuses (void); @@ -88,14 +88,14 @@ protected: /// The ServerID used for session authentication; set in StartEncryption(), used in GetAuthServerID() AString m_AuthServerID; - virtual void SendData(const char * a_Data, size_t a_Size) /*override*/; + virtual void SendData(const char * a_Data, size_t a_Size) override; // DEBUG: - virtual void Flush(void) /*override*/; + virtual void Flush(void) override; // Items in slots are sent differently - virtual void WriteItem(const cItem & a_Item) /*override*/; - virtual int ParseItem(cItem & a_Item) /*override*/; + virtual void WriteItem(const cItem & a_Item) override; + virtual int ParseItem(cItem & a_Item) override; /// Parses the metadata that may come with the item. int ParseItemMetadata(cItem & a_Item, const AString & a_Metadata); |