1 files changed, 58 insertions, 36 deletions

diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index f1ff4013..f365bb7f 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,11 +19,16 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <cassert>
+#include "net/messagein.h"
+
+#ifdef TMWSERV_SUPPORT
+#include <enet/enet.h>
+#else
 #include <SDL.h>
 #include <SDL_endian.h>
+#endif
 
-#include "messagein.h"
+#include <cassert>
 
 #define MAKEWORD(low,high) \
     ((unsigned short)(((unsigned char)(low)) | \
@@ -39,32 +43,68 @@ MessageIn::MessageIn(const char *data, unsigned int length):
     mId = readInt16();
 }
 
-Sint8 MessageIn::readInt8()
+int MessageIn::readInt8()
 {
-    assert(mPos < mLength);
-    return mData[mPos++];
+    int value = -1;
+    if (mPos < mLength)
+    {
+        value = (unsigned char) mData[mPos];
+    }
+    mPos += 1;
+    return value;
 }
 
-Sint16 MessageIn::readInt16()
+int MessageIn::readInt16()
 {
-    assert(mPos + 2 <= mLength);
-    mPos += 2;
+    int value = -1;
+    if (mPos + 2 <= mLength)
+    {
+#ifdef TMWSERV_SUPPORT
+        uint16_t t;
+        memcpy(&t, mData + mPos, 2);
+        value = (unsigned short) ENET_NET_TO_HOST_16(t);
+#else
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    return SDL_Swap16(*(Sint16*)(mData + (mPos - 2)));
+        value = SDL_Swap16(*(Sint16*)(mData + mPos));
 #else
-    return (*(Sint16*)(mData + (mPos - 2)));
+        value = (*(Sint16*)(mData + mPos));
 #endif
+#endif // TMWSERV_SUPPORT
+    }
+    mPos += 2;
+    return value;
 }
 
-Sint32 MessageIn::readInt32()
+int MessageIn::readInt32()
 {
-    assert(mPos + 4 <= mLength);
-    mPos += 4;
+    int value = -1;
+    if (mPos + 4 <= mLength)
+    {
+#ifdef TMWSERV_SUPPORT
+        uint32_t t;
+        memcpy(&t, mData + mPos, 4);
+        value = ENET_NET_TO_HOST_32(t);
+#else
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    return SDL_Swap32(*(Sint32*)(mData + (mPos - 4)));
+        value = SDL_Swap32(*(Sint32*)(mData + mPos));
 #else
-    return (*(Sint32*)(mData + (mPos - 4)));
+        value = (*(Sint32*)(mData + mPos));
 #endif
+#endif // TMWSERV_SUPPORT
+    }
+    mPos += 4;
+    return value;
+}
+
+void MessageIn::readCoordinates(Uint16 &x, Uint16 &y)
+{
+    if (mPos + 3 <= mLength)
+    {
+        unsigned char const *p = reinterpret_cast< unsigned char const * >(mData + mPos);
+        x = p[0] | ((p[1] & 0x07) << 8);
+        y = (p[1] >> 3) | ((p[2] & 0x3F) << 5);
+    }
+    mPos += 3;
 }
 
 void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction)
@@ -165,21 +205,3 @@ std::string MessageIn::readString(int length)
     mPos += length;
     return readString;
 }
-
-Sint8& operator<<(Sint8 &lhs, MessageIn &msg)
-{
-    lhs = msg.readInt8();
-    return lhs;
-}
-
-Sint16& operator<<(Sint16 &lhs, MessageIn &msg)
-{
-    lhs = msg.readInt16();
-    return lhs;
-}
-
-Sint32& operator<<(Sint32 &lhs, MessageIn &msg)
-{
-    lhs = msg.readInt32();
-    return lhs;
-}