ControllerInterface: Make UpdateInput / UpdateOutput return void

The return values here have never been checked, so it doesn't make sense
to return a value to begin with.
This commit is contained in:
Jasper St. Pierre
2014-11-13 00:55:14 -08:00
parent 61fcfc4bf2
commit f2787f620e
19 changed files with 35 additions and 76 deletions

View File

@ -177,7 +177,7 @@ std::string Joystick::GetSource() const
// update IO
bool Joystick::UpdateInput()
void Joystick::UpdateInput()
{
HRESULT hr = 0;
@ -215,9 +215,7 @@ bool Joystick::UpdateInput()
// try reacquire if input lost
if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr)
hr = m_device->Acquire();
return SUCCEEDED(hr);
m_device->Acquire();
}
// get name

View File

@ -52,7 +52,7 @@ private:
};
public:
bool UpdateInput();
void UpdateInput() override;
Joystick(const LPDIRECTINPUTDEVICE8 device, const unsigned int index);
~Joystick();

View File

@ -139,7 +139,7 @@ void GetMousePos(ControlState* const x, ControlState* const y)
*y = (ControlState)point.y / (ControlState)win_height * 2 - 1;
}
bool KeyboardMouse::UpdateInput()
void KeyboardMouse::UpdateInput()
{
DIMOUSESTATE2 tmp_mouse;
@ -175,11 +175,7 @@ bool KeyboardMouse::UpdateInput()
// update mouse cursor
GetMousePos(&m_state_in.cursor.x, &m_state_in.cursor.y);
return true;
}
return false;
}
std::string KeyboardMouse::GetName() const

View File

@ -77,7 +77,7 @@ private:
};
public:
bool UpdateInput();
void UpdateInput() override;
KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device);
~KeyboardMouse();