diff --git a/src/pc/controller/controller_sdl1.c b/src/pc/controller/controller_sdl1.c index 37316674..927cb730 100644 --- a/src/pc/controller/controller_sdl1.c +++ b/src/pc/controller/controller_sdl1.c @@ -123,9 +123,10 @@ static void controller_sdl_init(void) { #ifdef BETTERCAMERA if (newcam_mouse == 1) SDL_WM_GrabInput(SDL_GRAB_ON); - SDL_GetRelativeMouseState(&mouse_x, &mouse_y); #endif + SDL_GetRelativeMouseState(&mouse_x, &mouse_y); + controller_sdl_bind(); init_ok = true; @@ -152,7 +153,8 @@ static void controller_sdl_read(OSContPad *pad) { SDL_WM_GrabInput(SDL_GRAB_ON); else SDL_WM_GrabInput(SDL_GRAB_OFF); - +#endif + u32 mouse = SDL_GetRelativeMouseState(&mouse_x, &mouse_y); for (u32 i = 0; i < num_mouse_binds; ++i) @@ -162,7 +164,6 @@ static void controller_sdl_read(OSContPad *pad) { // remember buttons that changed from 0 to 1 last_mouse = (mouse_buttons ^ mouse) & mouse; mouse_buttons = mouse; -#endif if (!sdl_joy) return; diff --git a/src/pc/controller/controller_sdl2.c b/src/pc/controller/controller_sdl2.c index c7e9c7c7..2001e7fe 100644 --- a/src/pc/controller/controller_sdl2.c +++ b/src/pc/controller/controller_sdl2.c @@ -112,9 +112,10 @@ static void controller_sdl_init(void) { #ifdef BETTERCAMERA if (newcam_mouse == 1) SDL_SetRelativeMouseMode(SDL_TRUE); - SDL_GetRelativeMouseState(&mouse_x, &mouse_y); #endif + SDL_GetRelativeMouseState(&mouse_x, &mouse_y); + controller_sdl_bind(); init_ok = true; @@ -156,7 +157,8 @@ static void controller_sdl_read(OSContPad *pad) { SDL_SetRelativeMouseMode(SDL_TRUE); else SDL_SetRelativeMouseMode(SDL_FALSE); - +#endif + u32 mouse = SDL_GetRelativeMouseState(&mouse_x, &mouse_y); for (u32 i = 0; i < num_mouse_binds; ++i) @@ -166,7 +168,6 @@ static void controller_sdl_read(OSContPad *pad) { // remember buttons that changed from 0 to 1 last_mouse = (mouse_buttons ^ mouse) & mouse; mouse_buttons = mouse; -#endif SDL_GameControllerUpdate();