summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
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.h
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.h')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
index 8f7ac67452..f4ad99db2d 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
@@ -25,7 +25,7 @@ private:
DIMOUSESTATE2 mouse;
struct
{
- float x, y;
+ ControlState x, y;
} cursor;
};
@@ -68,10 +68,10 @@ private:
public:
std::string GetName() const;
bool IsDetectable() { return false; }
- Cursor(u8 index, const float& axis, const bool positive) : m_index(index), m_axis(axis), m_positive(positive) {}
+ Cursor(u8 index, const ControlState& axis, const bool positive) : m_index(index), m_axis(axis), m_positive(positive) {}
ControlState GetState() const;
private:
- const float& m_axis;
+ const ControlState& m_axis;
const u8 m_index;
const bool m_positive;
};