mirror of
https://github.com/Ryujinx/SDL.git
synced 2025-01-03 16:46:51 +00:00
build fixes after d0bbfdbfb8
This commit is contained in:
parent
3bdc62215e
commit
b990e9145b
|
@ -676,7 +676,7 @@ static int SDL_SYS_ToDirection(Uint16 *dest, SDL_HapticDirection *src)
|
||||||
*dest = (src->dir[0] >= 0 ? 0x4000 : 0xC000);
|
*dest = (src->dir[0] >= 0 ? 0x4000 : 0xC000);
|
||||||
} else if (!src->dir[0]) {
|
} else if (!src->dir[0]) {
|
||||||
*dest = (src->dir[1] >= 0 ? 0x8000 : 0);
|
*dest = (src->dir[1] >= 0 ? 0x8000 : 0);
|
||||||
else {
|
} else {
|
||||||
float f = SDL_atan2(src->dir[1], src->dir[0]); /* Ideally we'd use fixed point math instead of floats... */
|
float f = SDL_atan2(src->dir[1], src->dir[0]); /* Ideally we'd use fixed point math instead of floats... */
|
||||||
/*
|
/*
|
||||||
SDL_atan2 takes the parameters: Y-axis-value and X-axis-value (in that order)
|
SDL_atan2 takes the parameters: Y-axis-value and X-axis-value (in that order)
|
||||||
|
|
|
@ -46,7 +46,7 @@ static SDL_Window *FindSDLWindowForNSWindow(NSWindow *win)
|
||||||
if (device && device->windows) {
|
if (device && device->windows) {
|
||||||
for (sdlwindow = device->windows; sdlwindow; sdlwindow = sdlwindow->next) {
|
for (sdlwindow = device->windows; sdlwindow; sdlwindow = sdlwindow->next) {
|
||||||
NSWindow *nswindow = ((__bridge SDL_WindowData *) sdlwindow->driverdata).nswindow;
|
NSWindow *nswindow = ((__bridge SDL_WindowData *) sdlwindow->driverdata).nswindow;
|
||||||
if (win == nswindow)
|
if (win == nswindow) {
|
||||||
return sdlwindow;
|
return sdlwindow;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -215,11 +215,9 @@ HandleModifiers(_THIS, unsigned short scancode, unsigned int modifierFlags)
|
||||||
NX_ALTERNATEMASK,
|
NX_ALTERNATEMASK,
|
||||||
NX_COMMANDMASK };
|
NX_COMMANDMASK };
|
||||||
|
|
||||||
for (int i = 0; i < 12; i++)
|
for (int i = 0; i < 12; i++) {
|
||||||
{
|
if (code == codes[i]) {
|
||||||
if (code == codes[i])
|
if (modifierFlags & modifiers[i]) {
|
||||||
{
|
|
||||||
if (modifierFlags & modifiers[i])
|
|
||||||
SDL_SendKeyboardKey(SDL_PRESSED, code);
|
SDL_SendKeyboardKey(SDL_PRESSED, code);
|
||||||
} else {
|
} else {
|
||||||
SDL_SendKeyboardKey(SDL_RELEASED, code);
|
SDL_SendKeyboardKey(SDL_RELEASED, code);
|
||||||
|
|
Loading…
Reference in a new issue