|
@@ -194,7 +194,7 @@ void JoypadWindows::setup_joypad_object(const DIDEVICEOBJECTINSTANCE *ob, int p_
|
|
|
HRESULT res;
|
|
|
DIPROPRANGE prop_range;
|
|
|
DIPROPDWORD dilong;
|
|
|
- DWORD ofs;
|
|
|
+ LONG ofs;
|
|
|
if (ob->guidType == GUID_XAxis)
|
|
|
ofs = DIJOFS_X;
|
|
|
else if (ob->guidType == GUID_YAxis)
|
|
@@ -395,7 +395,7 @@ void JoypadWindows::process_joypads() {
|
|
|
|
|
|
// on mingw, these constants are not constants
|
|
|
int count = 8;
|
|
|
- unsigned int axes[] = { DIJOFS_X, DIJOFS_Y, DIJOFS_Z, DIJOFS_RX, DIJOFS_RY, DIJOFS_RZ, DIJOFS_SLIDER(0), DIJOFS_SLIDER(1) };
|
|
|
+ LONG axes[] = { DIJOFS_X, DIJOFS_Y, DIJOFS_Z, DIJOFS_RX, DIJOFS_RY, DIJOFS_RZ, (LONG)DIJOFS_SLIDER(0), (LONG)DIJOFS_SLIDER(1) };
|
|
|
int values[] = { js.lX, js.lY, js.lZ, js.lRx, js.lRy, js.lRz, js.rglSlider[0], js.rglSlider[1] };
|
|
|
|
|
|
for (int j = 0; j < joy->joy_axis.size(); j++) {
|