summaryrefslogtreecommitdiff
path: root/src/game.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-22 19:45:03 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-22 19:45:56 +0100
commit0c43d04b438d41c277ae80402d4b4888db1a0b64 (patch)
tree3aaeb75ecd1bcbe85decedab5f1fa426fe0411e3 /src/game.h
parenta7f5eaeb7f643658d356533a608f0f18d85b6d32 (diff)
parent401802c1d7a1b3d659bdc53a45d9a6292fc1121e (diff)
downloadmana-client-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.gz
mana-client-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.bz2
mana-client-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.xz
mana-client-0c43d04b438d41c277ae80402d4b4888db1a0b64.zip
Merged the tmwserv client with the eAthena client
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h24
1 files changed, 22 insertions, 2 deletions
diff --git a/src/game.h b/src/game.h
index d7d2a562..7eecc036 100644
--- a/src/game.h
+++ b/src/game.h
@@ -24,10 +24,14 @@
#include <memory>
+#include "SDL.h"
+
#include "configlistener.h"
class MessageHandler;
+#ifdef EATHENA_SUPPORT
class Network;
+#endif
extern std::string map_path;
extern volatile int fps;
@@ -36,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();
@@ -46,7 +54,9 @@ 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;
@@ -56,15 +66,25 @@ 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 mEquipmentHandler;
MessageHandlerPtr mInventoryHandler;
MessageHandlerPtr mItemHandler;
MessageHandlerPtr mNpcHandler;
MessageHandlerPtr mPlayerHandler;
- MessageHandlerPtr mSkillHandler;
+ MessageHandlerPtr mPostHandler;
MessageHandlerPtr mTradeHandler;
+
+ SDL_TimerID mLogicCounterId;
+ SDL_TimerID mSecondsCounterId;
};
/**