summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-11-01 17:41:07 +0300
committerAndrei Karas <akaras@inbox.ru>2013-11-01 21:33:37 +0300
commit93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f (patch)
tree7501c33d86faee4450558989519b721bef1b414c /src/input
parent748b2dc257650d9ff6e740496802cb977227bc21 (diff)
downloadmv-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/input')
-rw-r--r--src/input/inputmanager.cpp5
-rw-r--r--src/input/joystick.cpp2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index e395aad8e..7e7da4433 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -20,7 +20,6 @@
#include "input/inputmanager.h"
-#include "client.h"
#include "configuration.h"
#include "game.h"
#include "touchmanager.h"
@@ -37,14 +36,16 @@
#include "gui/widgets/tabs/setup_input.h"
+#include "gui/windows/chatwindow.h"
#include "gui/windows/inventorywindow.h"
#include "gui/windows/npcdialog.h"
#include "gui/windows/npcpostdialog.h"
#include "gui/windows/setup.h"
#include "gui/windows/textdialog.h"
#include "gui/windows/tradewindow.h"
+#include "gui/windows/quitdialog.h"
-#include "gui/windows/chatwindow.h"
+#include "utils/timer.h"
#include <guichan/exception.hpp>
#include <guichan/focushandler.hpp>
diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp
index 99a751525..aa7aa3ee9 100644
--- a/src/input/joystick.cpp
+++ b/src/input/joystick.cpp
@@ -29,6 +29,8 @@
#include "input/inputmanager.h"
+#include "utils/timer.h"
+
#include "debug.h"
int Joystick::joystickCount = 0;