summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-11-27 22:24:48 +0000
committerIra Rice <irarice@gmail.com>2008-11-27 22:24:48 +0000
commitc6adb930edd2d0a88d7c5ca4edd58d95382a5abf (patch)
tree83e8a74019c8c633d90a7e24504dd22006e768cb /src/game.cpp
parent886a5d4803e277b053014ae6b5c1c347f7756d48 (diff)
downloadmana-c6adb930edd2d0a88d7c5ca4edd58d95382a5abf.tar.gz
mana-c6adb930edd2d0a88d7c5ca4edd58d95382a5abf.tar.bz2
mana-c6adb930edd2d0a88d7c5ca4edd58d95382a5abf.tar.xz
mana-c6adb930edd2d0a88d7c5ca4edd58d95382a5abf.zip
Merged a patch by Bjorn to fix allowing the joystick to be used without
being enabled first. A similar patch was asked for by Doorsman here, so this combined with the setup button on client startup, should be enough to fulfill that request from Doors.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 34fb4622..16bc082b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -297,9 +297,7 @@ Game::Game(Network *network):
// TODO: The user should be able to choose which one to use
// Open the first device
if (Joystick::getNumberOfJoysticks() > 0)
- {
- joystick = new Joystick(0);
- }
+ joystick = new Joystick(0);
network->registerHandler(mBeingHandler.get());
network->registerHandler(mBuySellHandler.get());