mirror of
https://github.com/godotengine/godot
synced 2024-09-05 06:58:29 +00:00
Use LONG instead of DWORD (unsigned int) when interacting with DIJOFS constants.
This commit is contained in:
parent
494bf38c76
commit
4a6e53b3c9
|
@ -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++) {
|
||||
|
|
|
@ -77,7 +77,7 @@ private:
|
|||
DWORD last_pad;
|
||||
|
||||
LPDIRECTINPUTDEVICE8 di_joy;
|
||||
List<DWORD> joy_axis;
|
||||
List<LONG> joy_axis;
|
||||
GUID guid;
|
||||
|
||||
dinput_gamepad() {
|
||||
|
|
Loading…
Reference in a new issue