minimal: Move get_craft_result tests to test mod

[dragonfireclient.git] / src / network / networkpacket.h

diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
index 008271fab77b021799c6e4cfd4f7907843506585..a8b741374f8b32d2d2ca678dd5d201e5580e9cac 100644 (file)
--- a/src/network/networkpacket.h
+++ b/src/network/networkpacket.h
@@ -19,26 +19,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-#include <ctime>
 #include "util/pointer.h"
 #include "util/numeric.h"
+#include "networkprotocol.h"
 #include <SColor.h>
 
 class NetworkPacket
 {
 
 public:
-       NetworkPacket(u16 command, u32 datasize, u16 peer_id);
+       NetworkPacket(u16 command, u32 datasize, session_t peer_id);
        NetworkPacket(u16 command, u32 datasize);
        NetworkPacket() = default;
 
        ~NetworkPacket();
 
-       void putRawPacket(u8 *data, u32 datasize, u16 peer_id);
+       void putRawPacket(u8 *data, u32 datasize, session_t peer_id);
 
        // Getters
-       u32 getSize() { return m_datasize; }
-       u16 getPeerId() { return m_peer_id; }
+       u32 getSize() const { return m_datasize; }
+       session_t getPeerId() const { return m_peer_id; }
        u16 getCommand() { return m_command; }
        const u32 getRemainingBytes() const { return m_datasize - m_read_offset; }
        const char *getRemainingString() { return getString(m_read_offset); }
@@ -87,9 +87,6 @@ class NetworkPacket
        NetworkPacket &operator>>(u64 &dst);
        NetworkPacket &operator<<(u64 src);
 
-       NetworkPacket &operator>>(std::time_t &dst);
-       NetworkPacket &operator<<(std::time_t src);
-
        NetworkPacket &operator>>(float &dst);
        NetworkPacket &operator<<(float src);
 
@@ -135,5 +132,5 @@ class NetworkPacket
        u32 m_datasize = 0;
        u32 m_read_offset = 0;
        u16 m_command = 0;
-       u16 m_peer_id = 0;
+       session_t m_peer_id = 0;
 };