1 files changed, 114 insertions, 11 deletions

diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 57c268e7..813b440f 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -1,29 +1,38 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana World
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  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
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "messagein.h"
 
-#include <string>
-
+#ifdef TMWSERV_SUPPORT
 #include <enet/enet.h>
+#else
+#include <SDL.h>
+#include <SDL_endian.h>
+#endif
+
+#include <cassert>
+
+#define MAKEWORD(low,high) \
+    ((unsigned short)(((unsigned char)(low)) | \
+    ((unsigned short)((unsigned char)(high))) << 8))
 
 MessageIn::MessageIn(const char *data, unsigned int length):
     mData(data),
@@ -50,9 +59,17 @@ int MessageIn::readInt16()
     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
+        value = SDL_Swap16(*(Sint16*)(mData + mPos));
+#else
+        value = (*(Sint16*)(mData + mPos));
+#endif
+#endif // TMWSERV_SUPPORT
     }
     mPos += 2;
     return value;
@@ -63,9 +80,17 @@ int MessageIn::readInt32()
     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
+        value = SDL_Swap32(*(Sint32*)(mData + mPos));
+#else
+        value = (*(Sint32*)(mData + mPos));
+#endif
+#endif // TMWSERV_SUPPORT
     }
     mPos += 4;
     return value;
@@ -82,6 +107,83 @@ void MessageIn::readCoordinates(Uint16 &x, Uint16 &y)
     mPos += 3;
 }
 
+void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction)
+{
+    assert(mPos + 3 <= mLength);
+
+    const char *data = mData + mPos;
+    Sint16 temp;
+
+    temp = MAKEWORD(data[1] & 0x00c0, data[0] & 0x00ff);
+    x = temp >> 6;
+    temp = MAKEWORD(data[2] & 0x00f0, data[1] & 0x003f);
+    y = temp >> 4;
+
+    direction = data[2] & 0x000f;
+
+    // Translate from eAthena format
+    switch (direction)
+    {
+        case 0:
+            direction = 1;
+            break;
+        case 1:
+            direction = 3;
+            break;
+        case 2:
+            direction = 2;
+            break;
+        case 3:
+            direction = 6;
+            break;
+        case 4:
+            direction = 4;
+            break;
+        case 5:
+            direction = 12;
+            break;
+        case 6:
+            direction = 8;
+            break;
+        case 7:
+            direction = 9;
+            break;
+        default:
+            // OOPSIE! Impossible or unknown
+            direction = 0;
+    }
+
+    mPos += 3;
+}
+
+void MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY,
+                              Uint16 &dstX, Uint16 &dstY)
+{
+    assert(mPos + 5 <= mLength);
+
+    const char *data = mData + mPos;
+    Sint16 temp;
+
+    temp = MAKEWORD(data[3], data[2] & 0x000f);
+    dstX = temp >> 2;
+
+    dstY = MAKEWORD(data[4], data[3] & 0x0003);
+
+    temp = MAKEWORD(data[1], data[0]);
+    srcX = temp >> 6;
+
+    temp = MAKEWORD(data[2], data[1] & 0x003f);
+    srcY = temp >> 4;
+
+    mPos += 5;
+}
+
+void MessageIn::skip(unsigned int length)
+{
+    assert(mPos + length <= mLength);
+    mPos += length;
+}
+
 std::string MessageIn::readString(int length)
 {
     // Get string length
@@ -89,16 +191,17 @@ std::string MessageIn::readString(int length)
         length = readInt16();
     }
 
-    // Make sure the string isn't erroneus
+    // Make sure the string isn't erroneous
     if (length < 0 || mPos + length > mLength) {
         mPos = mLength + 1;
         return "";
     }
 
     // Read the string
-    char const *stringBeg = mData + mPos,
-               *stringEnd = (char const *)memchr(stringBeg, '\0', length);
-    std::string readString(stringBeg, stringEnd ? stringEnd - stringBeg : length);
+    char const *stringBeg = mData + mPos;
+    char const *stringEnd = (char const *)memchr(stringBeg, '\0', length);
+    std::string readString(stringBeg,
+                           stringEnd ? stringEnd - stringBeg : length);
     mPos += length;
     return readString;
 }