encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed GameCube rumble

This commit is contained in:
Sam Lantinga 2019-12-19 18:00:08 -08:00
parent 202c966a44
commit 25bd5070f5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/joystick/hidapi/SDL_hidapi_gamecube.c
View File

@ -147,7 +147,6 @@ HIDAPI_DriverGameCube_UpdateDevice(SDL_HIDAPI_Device *device)
SDL_Joystick *joystick; SDL_Joystick *joystick;
Uint8 packet[37]; Uint8 packet[37];
Uint8 *curSlot; Uint8 *curSlot;
Uint32 now;
Uint8 i; Uint8 i;
int size; int size;
@ -225,9 +224,9 @@ HIDAPI_DriverGameCube_UpdateDevice(SDL_HIDAPI_Device *device)
} }
/* Write rumble packet */ /* Write rumble packet */
now = SDL_GetTicks();
for (i = 0; i < 4; i += 1) { for (i = 0; i < 4; i += 1) {
if (ctx->rumbleExpiration[i] > 0) { if (ctx->rumbleExpiration[i] || (ctx->rumble[1 + i] && !ctx->rumbleAllowed[i])) {
Uint32 now = SDL_GetTicks();
if (SDL_TICKS_PASSED(now, ctx->rumbleExpiration[i]) || !ctx->rumbleAllowed[i]) { if (SDL_TICKS_PASSED(now, ctx->rumbleExpiration[i]) || !ctx->rumbleAllowed[i]) {
ctx->rumble[1 + i] = 0; ctx->rumble[1 + i] = 0;
ctx->rumbleExpiration[i] = 0; ctx->rumbleExpiration[i] = 0;
@ -279,8 +278,8 @@ HIDAPI_DriverGameCube_RumbleJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *jo
ctx->rumble[i + 1] = val; ctx->rumble[i + 1] = val;
ctx->rumbleUpdate = SDL_TRUE; ctx->rumbleUpdate = SDL_TRUE;
} }
if (val && duration_ms < SDL_HAPTIC_INFINITY) { if (val && duration_ms) {
ctx->rumbleExpiration[i] = SDL_GetTicks() + duration_ms; ctx->rumbleExpiration[i] = SDL_GetTicks() + SDL_min(duration_ms, SDL_MAX_RUMBLE_DURATION_MS);
} else { } else {
ctx->rumbleExpiration[i] = 0; ctx->rumbleExpiration[i] = 0;
} }