diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-01 17:41:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-01 21:33:37 +0300 |
| commit | 93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f (patch) | |
| tree | 7501c33d86faee4450558989519b721bef1b414c /src/net | |
| parent | 748b2dc257650d9ff6e740496802cb977227bc21 (diff) | |
| download | mv-93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f.tar.gz mv-93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f.tar.bz2 mv-93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f.tar.xz mv-93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f.zip | |
Move timers from client into timers file.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 9 | ||||
| -rw-r--r-- | src/net/ea/buysellhandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 6 |
4 files changed, 16 insertions, 7 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 4938ea525..daef49b42 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -25,7 +25,6 @@ #include "net/ea/eaprotocol.h" #include "actormanager.h" -#include "client.h" #include "configuration.h" #include "effectmanager.h" #include "game.h" @@ -39,13 +38,13 @@ #include "input/keyboardconfig.h" +#include "gui/windows/botcheckerwindow.h" +#include "gui/windows/outfitwindow.h" #include "gui/windows/socialwindow.h" #include "gui/windows/killstats.h" #include "gui/windows/questswindow.h" -#include "gui/windows/botcheckerwindow.h" - -#include "gui/windows/outfitwindow.h" +#include "utils/timer.h" #include "resources/iteminfo.h" @@ -53,6 +52,8 @@ #include "debug.h" +extern int serverVersion; + namespace Ea { BeingHandler::BeingHandler(const bool enableSync) : diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 15a4385dc..581e706b3 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -22,7 +22,6 @@ #include "net/ea/buysellhandler.h" -#include "client.h" #include "configuration.h" #include "inventory.h" #include "notifications.h" @@ -42,6 +41,8 @@ #include "net/ea/eaprotocol.h" +#include "utils/timer.h" + #include "debug.h" namespace Ea diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index ab0af709e..652776e28 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -23,7 +23,6 @@ #include "net/eathena/beinghandler.h" #include "actormanager.h" -#include "client.h" #include "guild.h" #include "guildmanager.h" #include "party.h" @@ -44,9 +43,13 @@ #include "resources/db/itemdb.h" +#include "utils/stringutils.h" +#include "utils/timer.h" + #include "debug.h" extern Net::BeingHandler *beingHandler; +extern int serverVersion; namespace EAthena { diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 8f91371b1..47d86a240 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -23,7 +23,6 @@ #include "net/tmwa/beinghandler.h" #include "actormanager.h" -#include "client.h" #include "guild.h" #include "guildmanager.h" #include "party.h" @@ -38,10 +37,15 @@ #include "resources/db/itemdb.h" +#include "utils/stringutils.h" +#include "utils/timer.h" + #include "debug.h" extern Net::BeingHandler *beingHandler; +extern int serverVersion; + namespace TmwAthena { |