use boolean for where it should.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47869 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 48 insertions, 34 deletions

diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
index a9c2a0d5..a684efa2 100644
--- a/gui/ConfDlg.c
+++ b/gui/ConfDlg.c
@@ -813,7 +813,7 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
 	if (t != Config.Cpu) {
 		psxCpu->Shutdown();
 #ifdef PSXREC
-		if (Config.Cpu) {
+		if (Config.Cpu == CPU_INTERPRETER) {
 			psxCpu = &psxInt;
 		}
 		else psxCpu = &psxRec;
@@ -869,7 +869,7 @@ void OnConf_Cpu() {
 	g_signal_connect_data(GTK_OBJECT(glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), "toggled",
 			GTK_SIGNAL_FUNC(OnCpu_CpuClicked), xml, NULL, G_CONNECT_AFTER);
 #else
-	Config.Cpu = 1;
+	Config.Cpu = CPU_INTERPRETER;
 
 	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), TRUE);
 	gtk_widget_set_sensitive(GTK_WIDGET (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), FALSE);
diff --git a/gui/Config.c b/gui/Config.c
index 97b2d0a4..bb7799e0 100644
--- a/gui/Config.c
+++ b/gui/Config.c
@@ -43,22 +43,32 @@ void GetValue(char *src, char *name, char *outvar) {
 }
 
 void GetValuel(char *src, char *name, long *var) {
-	char *tmp = strstr(src, name); 
-	if (tmp != NULL) { 
-		tmp+=strlen(name); 
-		while ((*tmp == ' ') || (*tmp == '=')) tmp++; 
-		if (*tmp != '\n') sscanf(tmp, "%lx", var); 
+	char *tmp = strstr(src, name);
+	if (tmp != NULL) {
+		tmp += strlen(name);
+		while ((*tmp == ' ') || (*tmp == '=')) tmp++;
+		if (*tmp != '\n') *var = atol(tmp);
+	}
+}
+
+void GetValueb(char *src, char *name, boolean *var) {
+	char *tmp = strstr(src, name);
+	if (tmp != NULL) {
+		tmp += strlen(name);
+		while ((*tmp == ' ') || (*tmp == '=')) tmp++;
+		if (*tmp != '\n') *var = (atoi(tmp) != 0);
 	}
-	return;
 }
 
 #define SetValue(name, var) \
-	fprintf (f,"%s = %s\n", name, var);
+	fprintf(f, "%s = %s\n", name, var);
 
 #define SetValuel(name, var) \
-	fprintf (f,"%s = %lx\n", name, var);
+	fprintf(f, "%s = %lx\n", name, var);
+
+#define SetValueb(name, var) \
+	fprintf(f, "%s = %d\n", name, (var) ? 1 : 0);
 
-/* TODO Use glib functions for filename handling, use constants, glib-key-value-file-parser */
 int LoadConfig(PcsxConfig *Conf) {
 	struct stat buf;
 	FILE *f;
@@ -90,7 +100,7 @@ int LoadConfig(PcsxConfig *Conf) {
 	f = fopen(cfgfile, "r");
 	if (f == NULL) return -1;
 
-	data = (char*)malloc(size + 1);
+	data = (char *)malloc(size + 1);
 	if (data == NULL) return -1;
 
 	fread(data, 1, buf.st_size, f);
@@ -109,18 +119,20 @@ int LoadConfig(PcsxConfig *Conf) {
 	GetValue(data, "Mcd2", Config.Mcd2);
 	GetValue(data, "BiosDir",    Config.BiosDir);
 	GetValue(data, "PluginsDir",    Config.PluginsDir);
-	GetValuel(data, "Xa",      &Config.Xa);
-	GetValuel(data, "Sio",     &Config.Sio);
-	GetValuel(data, "Mdec",    &Config.Mdec);
-	GetValuel(data, "PsxAuto", &Config.PsxAuto);
-	GetValuel(data, "PsxType", &Config.PsxType);
-	GetValuel(data, "Cdda",    &Config.Cdda);
+
+	GetValueb(data, "Xa",      &Config.Xa);
+	GetValueb(data, "Sio",     &Config.Sio);
+	GetValueb(data, "Mdec",    &Config.Mdec);
+	GetValueb(data, "PsxAuto", &Config.PsxAuto);
+	GetValueb(data, "Cdda",    &Config.Cdda);
+	GetValueb(data, "Dbg",     &Config.Debug);
+	GetValueb(data, "PsxOut",  &Config.PsxOut);
+	GetValueb(data, "SpuIrq",  &Config.SpuIrq);
+	GetValueb(data, "RCntFix", &Config.RCntFix);
+	GetValueb(data, "VSyncWA", &Config.VSyncWA);
+
 	GetValuel(data, "Cpu",     &Config.Cpu);
-	GetValuel(data, "Dbg",     &Config.Debug);
-	GetValuel(data, "PsxOut",  &Config.PsxOut);
-	GetValuel(data, "SpuIrq",  &Config.SpuIrq);
-	GetValuel(data, "RCntFix", &Config.RCntFix);
-	GetValuel(data, "VSyncWA", &Config.VSyncWA);
+	GetValuel(data, "PsxType", &Config.PsxType);
 
 	free(data);
 
@@ -147,18 +159,20 @@ void SaveConfig() {
 	SetValue("Mcd2", Config.Mcd2);
 	SetValue("BiosDir",    Config.BiosDir);
 	SetValue("PluginsDir",    Config.PluginsDir);
-	SetValuel("Xa",      Config.Xa);
-	SetValuel("Sio",     Config.Sio);
-	SetValuel("Mdec",    Config.Mdec);
-	SetValuel("PsxAuto", Config.PsxAuto);
-	SetValuel("PsxType", Config.PsxType);
-	SetValuel("Cdda",    Config.Cdda);
+
+	SetValueb("Xa",      Config.Xa);
+	SetValueb("Sio",     Config.Sio);
+	SetValueb("Mdec",    Config.Mdec);
+	SetValueb("PsxAuto", Config.PsxAuto);
+	SetValueb("Cdda",    Config.Cdda);
+	SetValueb("Dbg",     Config.Debug);
+	SetValueb("PsxOut",  Config.PsxOut);
+	SetValueb("SpuIrq",  Config.SpuIrq);
+	SetValueb("RCntFix", Config.RCntFix);
+	SetValueb("VSyncWA", Config.VSyncWA);
+
 	SetValuel("Cpu",     Config.Cpu);
-	SetValuel("Dbg",     Config.Debug);
-	SetValuel("PsxOut",  Config.PsxOut);
-	SetValuel("SpuIrq",  Config.SpuIrq);
-	SetValuel("RCntFix", Config.RCntFix);
-	SetValuel("VSyncWA", Config.VSyncWA);
+	SetValuel("PsxType", Config.PsxType);
 
 	fclose(f);
 }