From 26ed480183c06e03a1029199d34ffcb9b0b640a5 Mon Sep 17 00:00:00 2001
From: dborth <dborth@0aaa047c-bd49-0410-9b25-49477284f1fd>
Date: Mon, 24 Nov 2008 07:33:57 +0000
Subject: [PATCH] change FSDisable to FourScore

---
 readme.txt               | 2 +-
 source/ngc/fceuconfig.c  | 2 +-
 source/ngc/fceugx.h      | 2 +-
 source/ngc/menu.c        | 6 +++---
 source/ngc/pad.c         | 2 +-
 source/ngc/preferences.c | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/readme.txt b/readme.txt
index 7bf58a5..7c2efe4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -33,7 +33,7 @@ SNES9x GX project.
 |0Oื๘oท                         UPDATE HISTORY                        ทo๘ืO0|
 `จ•จจจจจ จจจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจจจจจจ จจจจจจจจจจจจจ'
 
-[What's New 2.0.7 - November 18, 2008]
+[What's New 2.0.7 - November 19, 2008]
 * Special thanks to eke-eke & KruLLo for contributions, bugfixes, and tips
 * Video code rewritten - now has original, unfiltered, filtered modes
 * Zoom option
diff --git a/source/ngc/fceuconfig.c b/source/ngc/fceuconfig.c
index 663e160..13fa9ae 100644
--- a/source/ngc/fceuconfig.c
+++ b/source/ngc/fceuconfig.c
@@ -24,7 +24,7 @@ DefaultSettings ()
 {
 	GCSettings.currpal = 0;
 	GCSettings.timing = 0; // 0 - NTSC, 1 - PAL
-	GCSettings.FSDisable = 1;
+	GCSettings.FourScore = 0;
 	GCSettings.zapper = 0;
 	GCSettings.crosshair = 1;
 	GCSettings.slimit = 1;
diff --git a/source/ngc/fceugx.h b/source/ngc/fceugx.h
index 8a32cb8..a5cd17b 100644
--- a/source/ngc/fceugx.h
+++ b/source/ngc/fceugx.h
@@ -63,7 +63,7 @@ struct SGCSettings{
 	int		hideoverscan;
 	int		currpal;
 	int		timing;
-	int		FSDisable;
+	int		FourScore;
 	int		zapper;
 	int		crosshair;
 	int		slimit;
diff --git a/source/ngc/menu.c b/source/ngc/menu.c
index ac3417f..47924ba 100644
--- a/source/ngc/menu.c
+++ b/source/ngc/menu.c
@@ -677,7 +677,7 @@ ConfigureControllers ()
 	while (quit == 0)
 	{
 		sprintf (ctlrmenu[0], "Four Score - %s",
-			GCSettings.FSDisable == false ? " ON" : "OFF");
+			GCSettings.FourScore == true ? " ON" : "OFF");
 
 		if (GCSettings.zapper == 0) sprintf (ctlrmenu[1],"Zapper - Disabled");
 		else if (GCSettings.zapper == 1) sprintf (ctlrmenu[1],"Zapper - Port 1");
@@ -692,8 +692,8 @@ ConfigureControllers ()
 		switch (ret)
 		{
 			case 0: // four score
-				GCSettings.FSDisable ^= 1;
-				ToggleFourScore(GCSettings.FSDisable, romLoaded);
+				GCSettings.FourScore ^= 1;
+				ToggleFourScore(GCSettings.FourScore, romLoaded);
 				break;
 
 			case 1: // zapper
diff --git a/source/ngc/pad.c b/source/ngc/pad.c
index a46274b..b18c91b 100644
--- a/source/ngc/pad.c
+++ b/source/ngc/pad.c
@@ -90,7 +90,7 @@ void InitialisePads()
 	FCEUI_SetInput(0, SI_GAMEPAD, InputDPR, 0);
 	FCEUI_SetInput(1, SI_GAMEPAD, InputDPR, 0);
 
-	ToggleFourScore(GCSettings.FSDisable, true);
+	ToggleFourScore(GCSettings.FourScore, true);
 	ToggleZapper(GCSettings.zapper, true);
 }
 
diff --git a/source/ngc/preferences.c b/source/ngc/preferences.c
index 5556034..f7f4ac6 100644
--- a/source/ngc/preferences.c
+++ b/source/ngc/preferences.c
@@ -177,7 +177,7 @@ preparePrefsData (int method)
 
 	createXMLSection("Controller", "Controller Settings");
 
-	createXMLSetting("FSDisable", "Four Score", toStr(GCSettings.FSDisable));
+	createXMLSetting("FourScore", "Four Score", toStr(GCSettings.FourScore));
 	createXMLSetting("zapper", "Zapper", toStr(GCSettings.zapper));
 	createXMLSetting("crosshair", "Zapper Crosshair", toStr(GCSettings.crosshair));
 	createXMLController(gcpadmap, "gcpadmap", "GameCube Pad");
@@ -303,7 +303,7 @@ decodePrefsData (int method)
 	loadXMLSettingInt(&GCSettings.hideoverscan, "hideoverscan");
 
 	// Controller Settings
-	loadXMLSettingInt(&GCSettings.FSDisable, "FSDisable");
+	loadXMLSettingInt(&GCSettings.FourScore, "FSDisable");
 	loadXMLSettingInt(&GCSettings.zapper, "zapper");
 	loadXMLSettingInt(&GCSettings.crosshair, "crosshair");