vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

allow mouse buttons when BETTERCAMERA is disabled (fix #496)

This commit is contained in:
fgsfds 2023-12-19 01:55:41 +01:00
parent e35f2ba8ef
commit 951389ca84
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pc/controller/controller_sdl1.c
View File

@ -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;

7
src/pc/controller/controller_sdl2.c
View File

@ -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();