change FSDisable to FourScore

This commit is contained in:
dborth 2008-11-24 07:33:57 +00:00
parent 12472a662f
commit 26ed480183
6 changed files with 9 additions and 9 deletions

View File

@ -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

View File

@ -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;

View File

@ -63,7 +63,7 @@ struct SGCSettings{
int hideoverscan;
int currpal;
int timing;
int FSDisable;
int FourScore;
int zapper;
int crosshair;
int slimit;

View File

@ -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

View File

@ -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);
}

View File

@ -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");