summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-07-15 23:43:22 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-07-15 23:43:22 +0000
commit9cea91975451a7abb6f15e08f7fb6c20efed152c (patch)
treeddf2aaf22597d8fa63a33dd62a57cb50e083f7e3 /src/game.cpp
parent97cac06ae12026f4be3765f68b0aea3caf02d8f0 (diff)
downloadmana-9cea91975451a7abb6f15e08f7fb6c20efed152c.tar.gz
mana-9cea91975451a7abb6f15e08f7fb6c20efed152c.tar.bz2
mana-9cea91975451a7abb6f15e08f7fb6c20efed152c.tar.xz
mana-9cea91975451a7abb6f15e08f7fb6c20efed152c.zip
Fixed compiler warnings and added plain text file loading to resource manager.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index f6d569b1..6013e4d5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -270,7 +270,7 @@ void do_input()
{
// TODO: one different value of tolerance is needed for each direction
// This probably means the need for a tuning utility/window
- int tolerance = config.getValue("joytolerance", 10);
+ int tolerance = (int)config.getValue("joytolerance", 10);
SDL_JoystickUpdate();
if (SDL_JoystickGetAxis(joypad, 0) > tolerance)
{