1 files changed, 27 insertions, 12 deletions

diff --git a/src/net/messageout.h b/src/net/messageout.h
index 4eadda5f..bc701b92 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -1,32 +1,39 @@
 /*
- *  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
  */
 
-#ifndef _TMWSERV_MESSAGEOUT_H_
-#define _TMWSERV_MESSAGEOUT_H_
+#ifndef MESSAGEOUT_
+#define MESSAGEOUT_
 
 #include <iosfwd>
+#include <SDL_types.h>
+
+#ifdef EATHENA_SUPPORT
+class Network;
+#endif
 
 /**
- * Used for building an outgoing message. When finished, the message is sent
- * using Net::Connection::send().
+ * Used for building an outgoing message.
+ *
+ * With tmwserv, the message is sent using Net::Connection::send() when
+ * finished.
  *
  * \ingroup Network
  */
@@ -36,16 +43,20 @@ class MessageOut
         /**
          * Constructor.
          */
+#ifdef TMWSERV_SUPPORT
         MessageOut(short id);
 
         /**
          * Destructor.
          */
         ~MessageOut();
+#else
+        MessageOut(Network *network);
+#endif
 
-        void writeInt8(char value);          /**< Writes a byte. */
-        void writeInt16(short value);        /**< Writes a short. */
-        void writeInt32(long value);         /**< Writes a long. */
+        void writeInt8(Sint8 value);          /**< Writes a byte. */
+        void writeInt16(Sint16 value);        /**< Writes a short. */
+        void writeInt32(Sint32 value);        /**< Writes a long. */
 
         /**
          * Writes a string. If a fixed length is not given (-1), it is stored
@@ -64,6 +75,7 @@ class MessageOut
         unsigned int getDataSize() const;
 
     private:
+#ifdef TMWSERV_SUPPORT
         /**
          * Expand the packet data to be able to hold more data.
          *
@@ -72,6 +84,9 @@ class MessageOut
          * added.
          */
         void expand(size_t size);
+#else
+        Network *mNetwork;
+#endif
 
         char *mData;                         /**< Data building up. */
         unsigned int mDataSize;              /**< Size of data. */