summaryrefslogtreecommitdiffhomepage
path: root/nGenEx/Joystick.cpp
diff options
context:
space:
mode:
authorFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2011-12-08 16:46:21 +0000
committerFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2011-12-08 16:46:21 +0000
commit396c12ee73193f4ac3665ecac2f634fc0b046697 (patch)
tree16edb33b60f95f6bda93bc84b3f2eb81e316ba1d /nGenEx/Joystick.cpp
parent50971e84e295033941fac5291b08e593541fe945 (diff)
downloadstarshatter-396c12ee73193f4ac3665ecac2f634fc0b046697.zip
starshatter-396c12ee73193f4ac3665ecac2f634fc0b046697.tar.gz
starshatter-396c12ee73193f4ac3665ecac2f634fc0b046697.tar.bz2
Fixes for unsafe string handling, variable scoping errors.
Diffstat (limited to 'nGenEx/Joystick.cpp')
-rw-r--r--nGenEx/Joystick.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/nGenEx/Joystick.cpp b/nGenEx/Joystick.cpp
index ba3b3ae..a2b80af 100644
--- a/nGenEx/Joystick.cpp
+++ b/nGenEx/Joystick.cpp
@@ -61,10 +61,10 @@ Joystick::Joystick()
for (int i = 0; i < MotionController::MaxActions; i++)
action[i] = false;
- for (i = 0; i < KEY_MAP_SIZE; i++)
+ for (int i = 0; i < KEY_MAP_SIZE; i++)
map[i] = 0;
- for (i = 0; i < 4; i++) {
+ for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
hat[i][j] = false;
}
@@ -524,7 +524,7 @@ Joystick::Acquire()
for (int i = 0; i < MotionController::MaxActions; i++)
action[i] = false;
- for (i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++)
for (int j = 0; j < 4; j++)
hat[i][j] = false;
@@ -585,7 +585,7 @@ Joystick::Acquire()
ProcessAxes(joy_x, joy_y, joy_r, joy_t);
- for (i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++)
ProcessHat(i, joystate.rgdwPOV[i]);
acquired = true;