remove sprite limit toggle, remove right joystick back-to-menu for CC

This commit is contained in:
dborth 2009-01-11 21:24:26 +00:00
parent b164582a09
commit 488fc92791
5 changed files with 2 additions and 16 deletions

View File

@ -30,7 +30,6 @@ DefaultSettings ()
GCSettings.FourScore = 0;
GCSettings.zapper = 0;
GCSettings.crosshair = 1;
GCSettings.slimit = 1;
GCSettings.Zoom = 0; // zooming default off
GCSettings.ZoomLevel = 1.0; // zoom amount

View File

@ -65,7 +65,6 @@ struct SGCSettings{
int FourScore;
int zapper;
int crosshair;
int slimit;
};
void ExitToLoader();

View File

@ -73,7 +73,7 @@ LoadManager ()
static void
VideoOptions ()
{
int videomenuCount = 8;
int videomenuCount = 7;
char videomenu[][50] = {
"Video Rendering",
@ -82,7 +82,6 @@ VideoOptions ()
"Palette",
"Enable Zooming",
"Timing",
"8 Sprite Limit",
"Back to Preferences Menu"
};
@ -123,9 +122,6 @@ VideoOptions ()
sprintf (videomenu[5], "Timing - %s",
GCSettings.timing == true ? " PAL" : "NTSC");
sprintf (videomenu[6], "8 Sprite Limit - %s",
GCSettings.slimit == true ? " ON" : "OFF");
ret = RunMenu (videomenu, videomenuCount, "Video Options", 20, -1);
switch (ret)
@ -162,13 +158,8 @@ VideoOptions ()
FCEUI_SetVidSystem(GCSettings.timing); // causes a small 'pop' in the audio
break;
case 6: // 8 sprite limit
GCSettings.slimit ^=1;
FCEUI_DisableSpriteLimitation(GCSettings.slimit);
break;
case -1: // Button B
case 7:
case 6:
quit = 1;
break;

View File

@ -558,7 +558,6 @@ void GetJoy()
#ifdef HW_RVL
|| (wm_pb & WPAD_BUTTON_HOME)
|| (wm_pb & WPAD_CLASSIC_BUTTON_HOME)
|| (wm_sx < -70)
#endif
)
{

View File

@ -157,7 +157,6 @@ preparePrefsData (int method)
createXMLSetting("currpal", "Palette", toStr(GCSettings.currpal));
createXMLSetting("timing", "Timing", toStr(GCSettings.timing));
createXMLSetting("slimit", "8 Sprite Limit", toStr(GCSettings.slimit));
createXMLSetting("Zoom", "Zoom On/Off", toStr(GCSettings.Zoom));
createXMLSetting("ZoomLevel", "Zoom Level", FtoStr(GCSettings.ZoomLevel));
createXMLSetting("render", "Video Filtering", toStr(GCSettings.render));
@ -309,7 +308,6 @@ decodePrefsData (int method)
loadXMLSettingInt(&GCSettings.currpal, "currpal");
loadXMLSettingInt(&GCSettings.timing, "timing");
loadXMLSettingInt(&GCSettings.slimit, "slimit");
loadXMLSettingInt(&GCSettings.Zoom, "Zoom");
loadXMLSettingFloat(&GCSettings.ZoomLevel, "ZoomLevel");
loadXMLSettingInt(&GCSettings.render, "render");