X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fcommon%2Fmain.c;h=bc2ef06d6f7149e452dd4634c7a32209c6c1fd21;hb=88e59df3676d6f36fd52e30f32624f49c7b0a355;hp=616b7c6252467359bc8bbc0a7db906632f5b1c66;hpb=4a2a617ac879a95babe3b8a822188b71e9769ba4;p=fceu.git

diff --git a/drivers/common/main.c b/drivers/common/main.c
index 616b7c6..bc2ef06 100644
--- a/drivers/common/main.c
+++ b/drivers/common/main.c
@@ -37,6 +37,7 @@
 #include "platform.h"
 #include "menu.h"
 #include "settings.h"
+#include "../libpicofe/config_file.h"
 
 #include "../../fce.h"
 #include "../../cart.h"
@@ -59,6 +60,8 @@ CFGSTRUCT DriverConfig[]={
 	AC(Settings.gamma),
 	AC(Settings.perfect_vsync),
 	AC(Settings.accurate_mode),
+	AC(Settings.sw_filter),
+	AC(Settings.hw_filter),
 	ENDCFGSTRUCT
 };
 
@@ -158,7 +161,9 @@ int SaveConfig(const char *llgn_path)
 {
 	const char *name = skip_path(llgn_path);
 	char tdir[2048];
+	FILE *f;
 	int ret;
+
 	if (name)
 	     sprintf(tdir,"%s"PSS"cfg"PSS"%s.cfg",BaseDirectory,name);
 	else sprintf(tdir,"%s"PSS"fceu2.cfg",BaseDirectory);
@@ -166,6 +171,17 @@ int SaveConfig(const char *llgn_path)
 	FCEUI_GetNTSCTH(&ntsctint, &ntschue);
         ret=SaveFCEUConfig(tdir,fceuconfig);
 	printf(ret == 0 ? "done\n" : "failed\n");
+
+	// keys
+	if (name)
+	     sprintf(tdir,"%s"PSS"cfg"PSS"%s_keys.cfg",BaseDirectory,name);
+	else sprintf(tdir,"%s"PSS"fceu_keys.cfg",BaseDirectory);
+	f=fopen(tdir, "w");
+	if (f!=NULL) {
+	 config_write_keys(f);
+	 fclose(f);
+	}
+
 	return ret;
 }
 
@@ -173,7 +189,9 @@ static int LoadConfig(const char *llgn_path)
 {
 	const char *name = skip_path(llgn_path);
 	char tdir[2048];
-	int ret;
+	FILE *f;
+	int ret, l;
+
 	if (name)
 	     sprintf(tdir,"%s"PSS"cfg"PSS"%s.cfg",BaseDirectory,name);
 	else sprintf(tdir,"%s"PSS"fceu2.cfg",BaseDirectory);
@@ -182,6 +200,19 @@ static int LoadConfig(const char *llgn_path)
         ret=LoadFCEUConfig(tdir,fceuconfig);
 	FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue);
 	printf(ret == 0 ? "done\n" : "failed\n");
+
+	// keys
+	if (name)
+	     sprintf(tdir,"%s"PSS"cfg"PSS"%s_keys.cfg",BaseDirectory,name);
+	else sprintf(tdir,"%s"PSS"fceu_keys.cfg",BaseDirectory);
+	f=fopen(tdir, "r");
+	if (f!=NULL) {
+	 l=fread(tdir,1,sizeof(tdir)-1,f);
+	 tdir[l]=0;
+	 config_read_keys(tdir);
+	 fclose(f);
+	}
+
 	return ret;
 }
 
@@ -413,7 +444,6 @@ int main(int argc, char *argv[])
         LoadConfig(NULL);
         last_arg_parsed=DoArgs(argc-1,&argv[1]);
 	platform_late_init();
-	in_probe();
 
 	LoadLLGN();
 	FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue);
@@ -478,6 +508,7 @@ int main(int argc, char *argv[])
 	  ret = menu_loop();
 	  if (ret == 1) break;		// exit emu
 	  if (ret == 2) {		// reload ROM
+	   SaveLLGN();
 	   Exit = 0;
 	   continue;
 	  }
@@ -495,7 +526,6 @@ int main(int argc, char *argv[])
 	if (fceugi)
 	 CloseGame();
 
-	SaveLLGN();
 	FCEUI_Kill();
 	DriverKill();
 	platform_finish();