1 files changed, 25 insertions, 13 deletions

diff --git a/src/game.h b/src/game.h
index 4035584b..7eecc036 100644
--- a/src/game.h
+++ b/src/game.h
@@ -1,38 +1,37 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  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 _TMW_GAME_
-#define _TMW_GAME_
+#ifndef GAME_H
+#define GAME_H
 
-#include <iosfwd>
 #include <memory>
 
 #include "SDL.h"
 
 #include "configlistener.h"
 
-#define SPEECH_TIME 80
-#define SPEECH_MAX_TIME 100
-
 class MessageHandler;
+#ifdef EATHENA_SUPPORT
+class Network;
+#endif
 
 extern std::string map_path;
 extern volatile int fps;
@@ -41,7 +40,11 @@ extern volatile int tick_time;
 class Game : public ConfigListener
 {
     public:
+#ifdef TMWSERV_SUPPORT
         Game();
+#else
+        Game(Network *network);
+#endif
         ~Game();
 
         void logic();
@@ -51,6 +54,10 @@ class Game : public ConfigListener
         void optionChanged(const std::string &name);
 
     private:
+#ifdef EATHENA_SUPPORT
+        Network *mNetwork;
+#endif
+
         /** Used to determine whether to draw the next frame. */
         int mDrawTime;
 
@@ -59,17 +66,22 @@ class Game : public ConfigListener
 
         typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
         MessageHandlerPtr mBeingHandler;
+#ifdef TMWSERV_SUPPORT
+        MessageHandlerPtr mGuildHandler;
+        MessageHandlerPtr mPartyHandler;
+        MessageHandlerPtr mEffectHandler;
+#else
+        MessageHandlerPtr mEquipmentHandler;
+        MessageHandlerPtr mSkillHandler;
+#endif
         MessageHandlerPtr mBuySellHandler;
         MessageHandlerPtr mChatHandler;
-        MessageHandlerPtr mGuildHandler;
         MessageHandlerPtr mInventoryHandler;
         MessageHandlerPtr mItemHandler;
         MessageHandlerPtr mNpcHandler;
-        MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;
         MessageHandlerPtr mPostHandler;
         MessageHandlerPtr mTradeHandler;
-        MessageHandlerPtr mEffectHandler;
 
         SDL_TimerID mLogicCounterId;
         SDL_TimerID mSecondsCounterId;