summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2023-05-26 16:51:49 +0200
committerAki <please@ignore.pl>2023-05-26 16:51:49 +0200
commit4f25bc561a191b16c29e23349526e3627e5b91be (patch)
treec5bb1acccd9d2f55ef854c7ad9816bae73fe5476
parent9269bfe00cce6625411ac19d2dddd14da8f517ad (diff)
downloadstarshatter-4f25bc561a191b16c29e23349526e3627e5b91be.zip
starshatter-4f25bc561a191b16c29e23349526e3627e5b91be.tar.gz
starshatter-4f25bc561a191b16c29e23349526e3627e5b91be.tar.bz2
Fixed wrong types and conversion in Joystick MM input
-rw-r--r--StarsEx/Joystick.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/StarsEx/Joystick.cpp b/StarsEx/Joystick.cpp
index 6881547..8679c10 100644
--- a/StarsEx/Joystick.cpp
+++ b/StarsEx/Joystick.cpp
@@ -465,26 +465,25 @@ Joystick::ReadAxisMM(int a)
return 0;
double result = 0;
-
switch (map_axis[a]) {
case KEY_JOY_AXIS_X:
if (joyinfo.dwFlags & JOY_RETURNX)
- result = joyinfo.dwXpos - 32768;
+ result = static_cast<double>(joyinfo.dwXpos) - 32768.0;
break;
case KEY_JOY_AXIS_Y:
if (joyinfo.dwFlags & JOY_RETURNY)
- result = joyinfo.dwYpos - 32768;
+ result = static_cast<double>(joyinfo.dwYpos) - 32768.0;
break;
case KEY_JOY_AXIS_Z:
if (joyinfo.dwFlags & JOY_RETURNZ)
- result = joyinfo.dwZpos - 32768;
+ result = static_cast<double>(joyinfo.dwZpos) - 32768.0;
break;
case KEY_JOY_AXIS_RZ:
if (joyinfo.dwFlags & JOY_RETURNR)
- result = joyinfo.dwRpos - 32768;
+ result = static_cast<double>(joyinfo.dwRpos) - 32768.0;
break;
}