From d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 17 Jun 2012 02:40:36 +0300 Subject: Properly and efficiently use split utility headers --- src/connection.h | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/connection.h') 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 -#include -#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 +#include 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) { -- cgit v1.2.3