diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-23 07:02:32 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-23 07:02:32 -0600 |
| commit | 7c360d2887216099ca8cc767f15a34fcf302803b (patch) | |
| tree | 308a8889e1173a27b4c20ef608c0749449c8aa04 /src/game.cpp | |
| parent | d3f315b45bd9055ac7f61082f5af54b863410517 (diff) | |
| download | mana-7c360d2887216099ca8cc767f15a34fcf302803b.tar.gz mana-7c360d2887216099ca8cc767f15a34fcf302803b.tar.bz2 mana-7c360d2887216099ca8cc767f15a34fcf302803b.tar.xz mana-7c360d2887216099ca8cc767f15a34fcf302803b.zip | |
Merge eA's command handling into CommandHandler
Also drop Aethyra's custom magic code
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/game.cpp b/src/game.cpp index ac18b7ce..aefefd29 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -28,9 +28,7 @@ #include "beingmanager.h" #include "channelmanager.h" -#ifdef TMWSERV_SUPPORT #include "commandhandler.h" -#endif #include "configuration.h" #include "effectmanager.h" #include "emoteshortcut.h" @@ -45,6 +43,9 @@ #include "log.h" #include "npc.h" #include "particle.h" +#ifdef EATHENA_SUPPORT +#include "party.h" +#endif #include "player_relations.h" #include "gui/buy.h" @@ -165,12 +166,14 @@ ShortcutWindow *emoteShortcutWindow; BeingManager *beingManager = NULL; FloorItemManager *floorItemManager = NULL; ChannelManager *channelManager = NULL; -#ifdef TMWSERV_SUPPORT CommandHandler *commandHandler = NULL; -#endif Particle* particleEngine = NULL; EffectManager *effectManager = NULL; +#ifdef EATHENA_SUPPORT +Party *playerParty = NULL; +#endif + const int MAX_TIME = 10000; /** @@ -362,18 +365,17 @@ Game::Game(Network *network): engine = new Engine; beingManager = new BeingManager; + commandHandler = new CommandHandler(); #else createGuiWindows(network); engine = new Engine(network); beingManager = new BeingManager(network); + commandHandler = new CommandHandler(network); #endif floorItemManager = new FloorItemManager; channelManager = new ChannelManager(); -#ifdef TMWSERV_SUPPORT - commandHandler = new CommandHandler(); -#endif effectManager = new EffectManager; particleEngine = new Particle(NULL); @@ -392,6 +394,7 @@ Game::Game(Network *network): beingManager->setPlayer(player_node); #ifdef EATHENA_SUPPORT player_node->setNetwork(network); + playerParty = new Party(network); #endif Joystick::init(); @@ -445,6 +448,8 @@ Game::~Game() { #ifdef TMWSERV_SUPPORT Net::clearHandlers(); +#else + delete playerParty; #endif delete player_node; @@ -453,9 +458,7 @@ Game::~Game() delete beingManager; delete floorItemManager; delete channelManager; -#ifdef TMWSERV_SUPPORT delete commandHandler; -#endif delete joystick; delete particleEngine; delete engine; |