diff options
Diffstat (limited to 'src/network/packet.h')
| -rw-r--r-- | src/network/packet.h | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/network/packet.h b/src/network/packet.h index aa9fa39e2..e69217488 100644 --- a/src/network/packet.h +++ b/src/network/packet.h | |||
| @@ -63,43 +63,43 @@ public: | |||
| 63 | 63 | ||
| 64 | explicit operator bool() const; | 64 | explicit operator bool() const; |
| 65 | 65 | ||
| 66 | /// Overloads of operator >> to read data from the packet | 66 | /// Overloads of read function to read data from the packet |
| 67 | Packet& operator>>(bool& out_data); | 67 | Packet& Read(bool& out_data); |
| 68 | Packet& operator>>(s8& out_data); | 68 | Packet& Read(s8& out_data); |
| 69 | Packet& operator>>(u8& out_data); | 69 | Packet& Read(u8& out_data); |
| 70 | Packet& operator>>(s16& out_data); | 70 | Packet& Read(s16& out_data); |
| 71 | Packet& operator>>(u16& out_data); | 71 | Packet& Read(u16& out_data); |
| 72 | Packet& operator>>(s32& out_data); | 72 | Packet& Read(s32& out_data); |
| 73 | Packet& operator>>(u32& out_data); | 73 | Packet& Read(u32& out_data); |
| 74 | Packet& operator>>(s64& out_data); | 74 | Packet& Read(s64& out_data); |
| 75 | Packet& operator>>(u64& out_data); | 75 | Packet& Read(u64& out_data); |
| 76 | Packet& operator>>(float& out_data); | 76 | Packet& Read(float& out_data); |
| 77 | Packet& operator>>(double& out_data); | 77 | Packet& Read(double& out_data); |
| 78 | Packet& operator>>(char* out_data); | 78 | Packet& Read(char* out_data); |
| 79 | Packet& operator>>(std::string& out_data); | 79 | Packet& Read(std::string& out_data); |
| 80 | template <typename T> | 80 | template <typename T> |
| 81 | Packet& operator>>(std::vector<T>& out_data); | 81 | Packet& Read(std::vector<T>& out_data); |
| 82 | template <typename T, std::size_t S> | 82 | template <typename T, std::size_t S> |
| 83 | Packet& operator>>(std::array<T, S>& out_data); | 83 | Packet& Read(std::array<T, S>& out_data); |
| 84 | 84 | ||
| 85 | /// Overloads of operator << to write data into the packet | 85 | /// Overloads of write function to write data into the packet |
| 86 | Packet& operator<<(bool in_data); | 86 | Packet& Write(bool in_data); |
| 87 | Packet& operator<<(s8 in_data); | 87 | Packet& Write(s8 in_data); |
| 88 | Packet& operator<<(u8 in_data); | 88 | Packet& Write(u8 in_data); |
| 89 | Packet& operator<<(s16 in_data); | 89 | Packet& Write(s16 in_data); |
| 90 | Packet& operator<<(u16 in_data); | 90 | Packet& Write(u16 in_data); |
| 91 | Packet& operator<<(s32 in_data); | 91 | Packet& Write(s32 in_data); |
| 92 | Packet& operator<<(u32 in_data); | 92 | Packet& Write(u32 in_data); |
| 93 | Packet& operator<<(s64 in_data); | 93 | Packet& Write(s64 in_data); |
| 94 | Packet& operator<<(u64 in_data); | 94 | Packet& Write(u64 in_data); |
| 95 | Packet& operator<<(float in_data); | 95 | Packet& Write(float in_data); |
| 96 | Packet& operator<<(double in_data); | 96 | Packet& Write(double in_data); |
| 97 | Packet& operator<<(const char* in_data); | 97 | Packet& Write(const char* in_data); |
| 98 | Packet& operator<<(const std::string& in_data); | 98 | Packet& Write(const std::string& in_data); |
| 99 | template <typename T> | 99 | template <typename T> |
| 100 | Packet& operator<<(const std::vector<T>& in_data); | 100 | Packet& Write(const std::vector<T>& in_data); |
| 101 | template <typename T, std::size_t S> | 101 | template <typename T, std::size_t S> |
| 102 | Packet& operator<<(const std::array<T, S>& data); | 102 | Packet& Write(const std::array<T, S>& data); |
| 103 | 103 | ||
| 104 | private: | 104 | private: |
| 105 | /** | 105 | /** |
| @@ -117,47 +117,47 @@ private: | |||
| 117 | }; | 117 | }; |
| 118 | 118 | ||
| 119 | template <typename T> | 119 | template <typename T> |
| 120 | Packet& Packet::operator>>(std::vector<T>& out_data) { | 120 | Packet& Packet::Read(std::vector<T>& out_data) { |
| 121 | // First extract the size | 121 | // First extract the size |
| 122 | u32 size = 0; | 122 | u32 size = 0; |
| 123 | *this >> size; | 123 | Read(size); |
| 124 | out_data.resize(size); | 124 | out_data.resize(size); |
| 125 | 125 | ||
| 126 | // Then extract the data | 126 | // Then extract the data |
| 127 | for (std::size_t i = 0; i < out_data.size(); ++i) { | 127 | for (std::size_t i = 0; i < out_data.size(); ++i) { |
| 128 | T character; | 128 | T character; |
| 129 | *this >> character; | 129 | Read(character); |
| 130 | out_data[i] = character; | 130 | out_data[i] = character; |
| 131 | } | 131 | } |
| 132 | return *this; | 132 | return *this; |
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | template <typename T, std::size_t S> | 135 | template <typename T, std::size_t S> |
| 136 | Packet& Packet::operator>>(std::array<T, S>& out_data) { | 136 | Packet& Packet::Read(std::array<T, S>& out_data) { |
| 137 | for (std::size_t i = 0; i < out_data.size(); ++i) { | 137 | for (std::size_t i = 0; i < out_data.size(); ++i) { |
| 138 | T character; | 138 | T character; |
| 139 | *this >> character; | 139 | Read(character); |
| 140 | out_data[i] = character; | 140 | out_data[i] = character; |
| 141 | } | 141 | } |
| 142 | return *this; | 142 | return *this; |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | template <typename T> | 145 | template <typename T> |
| 146 | Packet& Packet::operator<<(const std::vector<T>& in_data) { | 146 | Packet& Packet::Write(const std::vector<T>& in_data) { |
| 147 | // First insert the size | 147 | // First insert the size |
| 148 | *this << static_cast<u32>(in_data.size()); | 148 | Write(static_cast<u32>(in_data.size())); |
| 149 | 149 | ||
| 150 | // Then insert the data | 150 | // Then insert the data |
| 151 | for (std::size_t i = 0; i < in_data.size(); ++i) { | 151 | for (std::size_t i = 0; i < in_data.size(); ++i) { |
| 152 | *this << in_data[i]; | 152 | Write(in_data[i]); |
| 153 | } | 153 | } |
| 154 | return *this; | 154 | return *this; |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | template <typename T, std::size_t S> | 157 | template <typename T, std::size_t S> |
| 158 | Packet& Packet::operator<<(const std::array<T, S>& in_data) { | 158 | Packet& Packet::Write(const std::array<T, S>& in_data) { |
| 159 | for (std::size_t i = 0; i < in_data.size(); ++i) { | 159 | for (std::size_t i = 0; i < in_data.size(); ++i) { |
| 160 | *this << in_data[i]; | 160 | Write(in_data[i]); |
| 161 | } | 161 | } |
| 162 | return *this; | 162 | return *this; |
| 163 | } | 163 | } |