summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-09 02:51:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-09 03:02:42 +0300
commit274737b8d9b46dfcf6fc696123e869bbf6adaaf6 (patch)
tree08bfff598179dd6083a38599811054f50e6a4e97 /src/client.cpp
parent0260dcea2e9fbd06ba2ee166862d089dc72516f4 (diff)
downloadmv-274737b8d9b46dfcf6fc696123e869bbf6adaaf6.tar.gz
mv-274737b8d9b46dfcf6fc696123e869bbf6adaaf6.tar.bz2
mv-274737b8d9b46dfcf6fc696123e869bbf6adaaf6.tar.xz
mv-274737b8d9b46dfcf6fc696123e869bbf6adaaf6.zip
Add support for joystick selection.
Fix enable/disable joystick support. Increase max joystick buttons number to 64. Prevent joystick usage without calibration.
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 9c7c8c9a2..c842d0d00 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -34,6 +34,7 @@
#include "guildmanager.h"
#include "graphicsvertexes.h"
#include "itemshortcut.h"
+#include "joystick.h"
#include "keyboardconfig.h"
#ifdef USE_OPENGL
#include "openglgraphics.h"
@@ -561,6 +562,8 @@ Client::Client(const Options &options):
// Initialise player relations
player_relations.init();
+ Joystick::init();
+
userPalette = new UserPalette;
setupWindow = new Setup;