Removed the shared base classes of MessageIn and MessageOut

There wasn't a whole lot gained by sharing a common base class, and it makes
extending the manaserv Message{In,Out} classes with a debugging mode
unnecessarily complicated.

Reviewed-by: Yohann Ferreira

1 files changed, 119 insertions, 1 deletions

diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index c4d083b3..899b135d 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -24,15 +24,32 @@
 #include <SDL.h>
 #include <SDL_endian.h>
 
+#define MAKEWORD(low,high) \
+    ((unsigned short)(((unsigned char)(low)) | \
+    ((unsigned short)((unsigned char)(high))) << 8))
+
 namespace TmwAthena  {
 
 MessageIn::MessageIn(const char *data, unsigned int length):
-        Net::MessageIn(data, length)
+    mData(data),
+    mLength(length),
+    mPos(0)
 {
     // Read the message ID
     mId = readInt16();
 }
 
+uint8_t MessageIn::readInt8()
+{
+    uint8_t value = 0;
+    if (mPos < mLength)
+    {
+        value = mData[mPos];
+    }
+    mPos++;
+    return value;
+}
+
 uint16_t MessageIn::readInt16()
 {
     uint16_t value = 0;
@@ -67,4 +84,105 @@ uint32_t MessageIn::readInt32()
     return value;
 }
 
+void MessageIn::readCoordinates(uint16_t &x, uint16_t &y, uint8_t &direction)
+{
+    if (mPos + 3 <= mLength)
+    {
+        const char *data = mData + mPos;
+        uint16_t 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 tmwAthena 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;
+            case 8:
+                direction = 8;
+                break;
+            default:
+                // OOPSIE! Impossible or unknown
+                direction = 0;
+        }
+    }
+    mPos += 3;
+}
+
+void MessageIn::readCoordinatePair(uint16_t &srcX, uint16_t &srcY,
+                                   uint16_t &dstX, uint16_t &dstY)
+{
+    if (mPos + 5 <= mLength)
+    {
+        const char *data = mData + mPos;
+        uint16_t 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)
+{
+    mPos += length;
+}
+
+std::string MessageIn::readString(int length)
+{
+    // Get string length
+    if (length < 0)
+        length = readInt16();
+
+    // 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;
+    char const *stringEnd = (char const *)memchr(stringBeg, '\0', length);
+    std::string readString(stringBeg,
+                           stringEnd ? stringEnd - stringBeg : length);
+    mPos += length;
+    return readString;
+}
+
 } // namespace TmwAthena