simplified SDL_GameControllerAddMappingsFromFile code

AL2009man · AL2009man · commit d4f311da361c · 2025-08-01T14:39:35.000-04:00
diff --git a/UnleashedRecomp/hid/driver/sdl_hid.cpp b/UnleashedRecomp/hid/driver/sdl_hid.cpp
@@ -345,11 +345,9 @@ void hid::Init()
 
     SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
 
-    // Load SDL_GameControllerDB mappings from file
-    const char* mappingFile = "gamecontrollerdb.txt";
-    int mappingsAdded = SDL_GameControllerAddMappingsFromFile(mappingFile);
-    if (mappingsAdded > 0) {
-        LOGFN("Loaded {} controller mapping(s) from SDL_GameControllerDB file", mappingsAdded, mappingFile);
+    // Load controller mappings from SDL_GameControllerDB
+    if (int mappings = SDL_GameControllerAddMappingsFromFile("gamecontrollerdb.txt"); mappings > 0) {
+        LOGFN("Loaded {} controller mappings", mappings);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -345,11 +345,9 @@ void hid::Init()`
`345`	`345`
`346`	`346`	`SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);`
`347`	`347`
`348`		`- // Load SDL_GameControllerDB mappings from file`
`349`		`- const char* mappingFile = "gamecontrollerdb.txt";`
`350`		`- int mappingsAdded = SDL_GameControllerAddMappingsFromFile(mappingFile);`
`351`		`- if (mappingsAdded > 0) {`
`352`		`- LOGFN("Loaded {} controller mapping(s) from SDL_GameControllerDB file", mappingsAdded, mappingFile);`
	`348`	`+ // Load controller mappings from SDL_GameControllerDB`
	`349`	`+ if (int mappings = SDL_GameControllerAddMappingsFromFile("gamecontrollerdb.txt"); mappings > 0) {`
	`350`	`+ LOGFN("Loaded {} controller mappings", mappings);`
`353`	`351`	`}`
`354`	`352`	`}`
`355`	`353`