diff controller_info.c @ 1852:a4cae960fd08

Allow config file to be saved with executable for "portable" setups
author Michael Pavone <pavone@retrodev.com>
date Wed, 24 Apr 2019 19:08:49 -0700
parents 3a8c4ee68568
children 52f136052ab0
line wrap: on
line diff
--- a/controller_info.c	Tue Apr 23 23:37:15 2019 -0700
+++ b/controller_info.c	Wed Apr 24 19:08:49 2019 -0700
@@ -6,6 +6,7 @@
 #include "controller_info.h"
 #include "config.h"
 #include "util.h"
+#include "blastem.h"
 
 typedef struct {
 	char const      *name;
@@ -66,7 +67,7 @@
 static void load_ctype_config(void)
 {
 	if (!loaded) {
-		info_config = load_overrideable_config("controller_types.cfg", "controller_types.cfg");
+		info_config = load_overrideable_config("controller_types.cfg", "controller_types.cfg", NULL);
 		loaded = 1;
 	}
 }
@@ -197,7 +198,7 @@
 	existing = tern_insert_ptr(existing, "subtype", (void *)subtype_names[info->subtype]);
 	existing = tern_insert_ptr(existing, "variant",  (void *)variant_names[info->variant]);
 	info_config = tern_insert_node(info_config, guid_string, existing);
-	persist_config_at(info_config, "controller_types.cfg");
+	persist_config_at(config, info_config, "controller_types.cfg");
 #endif	
 }
 
@@ -209,7 +210,7 @@
 	tern_node *existing = tern_find_node(info_config, guid_string);
 	existing = tern_insert_ptr(existing, "mapping", mapping_string);
 	info_config = tern_insert_node(info_config, guid_string, existing);
-	persist_config_at(info_config, "controller_types.cfg");
+	persist_config_at(config, info_config, "controller_types.cfg");
 #endif
 }