sm64-mirrors/sm64ex
1
0
Fork 0
mirror of https://github.com/sm64pc/sm64ex.git synced 2025-01-22 15:43:04 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #450 from DanTheMan827/patch-3

Browse source 
Load gamecontrollerdb.txt before SDL_Init (Nightly)
This commit is contained in:
fgsfds 2021-01-22 20:23:19 +03:00 committed by GitHub
commit 0f68537e09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/pc/controller/controller_sdl2.c
View file

@ -89,13 +89,6 @@ static void controller_sdl_bind(void) {
} }
static void controller_sdl_init(void) { static void controller_sdl_init(void) {
if (SDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_EVENTS) != 0) {
fprintf(stderr, "SDL init error: %s\n", SDL_GetError());
return;
}
haptics_enabled = (SDL_InitSubSystem(SDL_INIT_HAPTIC) == 0);
// try loading an external gamecontroller mapping file // try loading an external gamecontroller mapping file
uint64_t gcsize = 0; uint64_t gcsize = 0;
void *gcdata = fs_load_file("gamecontrollerdb.txt", &gcsize); void *gcdata = fs_load_file("gamecontrollerdb.txt", &gcsize);
@ -109,6 +102,13 @@ static void controller_sdl_init(void) {
free(gcdata); free(gcdata);
} }
if (SDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_EVENTS) != 0) {
fprintf(stderr, "SDL init error: %s\n", SDL_GetError());
return;
}
haptics_enabled = (SDL_InitSubSystem(SDL_INIT_HAPTIC) == 0);
#ifdef BETTERCAMERA #ifdef BETTERCAMERA
if (newcam_mouse == 1) if (newcam_mouse == 1)
SDL_SetRelativeMouseMode(SDL_TRUE); SDL_SetRelativeMouseMode(SDL_TRUE);