summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2014-11-15 23:31:47 +1100
committerskidau <skidau@gmail.com>2014-11-15 23:31:47 +1100
commitcf8035e24017782635f20bd564a9cb6aee37b136 (patch)
tree495f0bb98d56312514620ebdee041e8ffc3c9019 /Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
parente47bfc2788f4ff166ee088e92aee0763b0d55647 (diff)
parente9cb629723bb0fabbad130c2a63b3cdbaaf8ba6a (diff)
Merge pull request #1521 from RachelBryk/double
Fix some double->float conversions.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index d9728dcbac..05f28c79ae 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -136,7 +136,7 @@ KeyboardMouse::KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIREC
AddInput(new Cursor(!!(i&2), (&m_state_in.cursor.x)[i/2], !!(i&1)));
}
-void GetMousePos(float* const x, float* const y)
+void GetMousePos(ControlState* const x, ControlState* const y)
{
POINT point = { 1, 1 };
GetCursorPos(&point);
@@ -151,8 +151,8 @@ void GetMousePos(float* const x, float* const y)
unsigned int win_height = rect.bottom - rect.top;
// Return the mouse position as a range from -1 to 1
- *x = (float)point.x / (float)win_width * 2 - 1;
- *y = (float)point.y / (float)win_height * 2 - 1;
+ *x = (ControlState)point.x / (ControlState)win_width * 2 - 1;
+ *y = (ControlState)point.y / (ControlState)win_height * 2 - 1;
}
bool KeyboardMouse::UpdateInput()