1 files changed, 59 insertions, 24 deletions

diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index b08332b6..f7ab6b41 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -1,80 +1,113 @@
 /*
- *  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 <cstring>
-#include <string>
+#include "messageout.h"
 
+#ifdef TMWSERV_SUPPORT
 #include <enet/enet.h>
+#else
+#include "ea/network.h"
+#include <SDL.h>
+#include <SDL_endian.h>
+#endif
 
-#include "messageout.h"
+#include <cstring>
+#include <string>
 
+#ifdef TMWSERV_SUPPORT
 MessageOut::MessageOut(short id):
     mData(0),
+#else
+MessageOut::MessageOut(Network *network):
+    mNetwork(network),
+#endif
     mDataSize(0),
     mPos(0)
 {
+#ifdef TMWSERV_SUPPORT
     writeInt16(id);
+#else
+    mData = mNetwork->mOutBuffer + mNetwork->mOutSize;
+#endif
 }
 
+#ifdef TMWSERV_SUPPORT
 MessageOut::~MessageOut()
 {
-    if (mData) {
-        free(mData);
-    }
+    free(mData);
 }
 
-void
-MessageOut::expand(size_t bytes)
+void MessageOut::expand(size_t bytes)
 {
     mData = (char*)realloc(mData, bytes);
     mDataSize = bytes;
 }
+#endif
 
-void
-MessageOut::writeInt8(char value)
+void MessageOut::writeInt8(Sint8 value)
 {
+#ifdef TMWSERV_SUPPORT
     expand(mPos + 1);
+#else
+    mNetwork->mOutSize += 1;
+#endif
     mData[mPos] = value;
     mPos += 1;
 }
 
-void MessageOut::writeInt16(short value)
+void MessageOut::writeInt16(Sint16 value)
 {
+#ifdef TMWSERV_SUPPORT
     expand(mPos + 2);
     uint16_t t = ENET_HOST_TO_NET_16(value);
     memcpy(mData + mPos, &t, 2);
+#else
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+    (*(Sint16 *)(mData + mPos)) = SDL_Swap16(value);
+#else
+    (*(Sint16 *)(mData + mPos)) = value;
+#endif
+    mNetwork->mOutSize += 2;
+#endif // TMWSERV_SUPPORT
     mPos += 2;
 }
 
-void
-MessageOut::writeInt32(long value)
+void MessageOut::writeInt32(Sint32 value)
 {
+#ifdef TMWSERV_SUPPORT
     expand(mPos + 4);
     uint32_t t = ENET_HOST_TO_NET_32(value);
     memcpy(mData + mPos, &t, 4);
+#else
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+    (*(Sint32 *)(mData + mPos)) = SDL_Swap32(value);
+#else
+    (*(Sint32 *)(mData + mPos)) = value;
+#endif
+    mNetwork->mOutSize += 4;
+#endif // TMWSERV_SUPPORT
     mPos += 4;
 }
 
-void
-MessageOut::writeString(const std::string &string, int length)
+void MessageOut::writeString(const std::string &string, int length)
 {
     int stringLength = string.length();
     if (length < 0)
@@ -88,7 +121,11 @@ MessageOut::writeString(const std::string &string, int length)
         // Make sure the length of the string is no longer than specified
         stringLength = length;
     }
+#ifdef TMWSERV_SUPPORT
     expand(mPos + length);
+#else
+    mNetwork->mOutSize += length;
+#endif
 
     // Write the actual string
     memcpy(mData + mPos, string.c_str(), stringLength);
@@ -101,14 +138,12 @@ MessageOut::writeString(const std::string &string, int length)
     mPos += length;
 }
 
-char*
-MessageOut::getData() const
+char *MessageOut::getData() const
 {
     return mData;
 }
 
-unsigned int
-MessageOut::getDataSize() const
+unsigned int MessageOut::getDataSize() const
 {
     return mDataSize;
 }