summaryrefslogtreecommitdiff
path: root/src/game.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/game.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/game.cpp')
-rw-r--r--src/game.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp
index f0964bbb4..d5cfad13a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -403,12 +403,6 @@ Game::Game():
*/
Net::getGameHandler()->ping(tick_time);
- Joystick::init();
- // TODO: The user should be able to choose which one to use
- // Open the first device
- if (Joystick::getNumberOfJoysticks() > 0)
- joystick = new Joystick(0);
-
if (setupWindow)
setupWindow->setInGame(true);
clearKeysArray();