izzy/sm64-izzys-port-android
0
0
Fork 0
mirror of https://github.com/izzy2lost/sm64-izzys-port-android.git synced 2026-07-05 15:19:31 -07:00
Code Issues Packages Projects Releases Wiki Activity

Load gamecontrollerdb.txt before SDL_Init

Browse Source
This commit is contained in:
DanTheMan827
2021-01-22 11:15:23 -06:00
committed by GitHub
parent 84a3e6e953
commit b9cdcb2d81
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pc/controller/controller_sdl2.c
+7 -7
View File
@@ -89,13 +89,6 @@ static void controller_sdl_bind(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
uint64_t gcsize = 0;
void *gcdata = fs_load_file("gamecontrollerdb.txt", &gcsize);
@@ -109,6 +102,13 @@ static void controller_sdl_init(void) {
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
if (newcam_mouse == 1)
SDL_SetRelativeMouseMode(SDL_TRUE);