JOY_1 -> JOY_BUTTON_1. I've confused DEVICE_JOY1 with JOY_1 many times.

This commit is contained in:
Chris Danford
2005-09-12 08:48:16 +00:00
parent f98cae8ae1
commit 6c2233fd03
4 changed files with 142 additions and 142 deletions
@@ -265,7 +265,7 @@ void InputHandler_DInput::UpdatePolled(DIDevice &device, const RageTimer &tm)
{
case in.BUTTON:
{
DeviceInput di(dev, JOY_1 + in.num, -1, tm);
DeviceInput di(dev, JOY_BUTTON_1 + in.num, -1, tm);
ButtonPressed(di, !!state.rgbButtons[in.ofs - DIJOFS_BUTTON0]);
break;
}
@@ -371,7 +371,7 @@ void InputHandler_DInput::UpdateBuffered(DIDevice &device, const RageTimer &tm)
break;
case in.BUTTON:
ButtonPressed(DeviceInput(dev, JOY_1 + in.num, -1, tm), !!evtbuf[i].dwData);
ButtonPressed(DeviceInput(dev, JOY_BUTTON_1 + in.num, -1, tm), !!evtbuf[i].dwData);
break;
case in.AXIS: