diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-06-17 02:40:36 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-06-17 02:40:36 +0300 |
| commit | d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d (patch) | |
| tree | 5b75f389b027a058e1f47fa3103a1cfb51f26b9b /src/connection.h | |
| parent | 1bc37d576ce790c1169c5f9996be7bbc8026db2c (diff) | |
| download | minetest-d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d.tar.gz minetest-d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d.tar.bz2 minetest-d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d.zip | |
Properly and efficiently use split utility headers
Diffstat (limited to 'src/connection.h')
| -rw-r--r-- | src/connection.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/connection.h b/src/connection.h index 51a98ed92..e03c7983f 100644 --- a/src/connection.h +++ b/src/connection.h @@ -20,14 +20,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef CONNECTION_HEADER #define CONNECTION_HEADER -#include <iostream> -#include <fstream> -#include "debug.h" -#include "common_irrlicht.h" +#include "irrlichttypes.h" #include "socket.h" -#include "utility.h" #include "exceptions.h" #include "constants.h" +#include "util/pointer.h" +#include "util/container.h" +#include "util/thread.h" +#include <iostream> +#include <fstream> namespace con { @@ -107,15 +108,6 @@ public: {} }; -inline u16 readPeerId(u8 *packetdata) -{ - return readU16(&packetdata[4]); -} -inline u8 readChannel(u8 *packetdata) -{ - return readU8(&packetdata[6]); -} - #define SEQNUM_MAX 65535 inline bool seqnum_higher(u16 higher, u16 lower) { |