mirror of
https://github.com/dborth/fceugx.git
synced 2025-01-07 14:28:18 +01:00
remove sprite limit toggle, remove right joystick back-to-menu for CC
This commit is contained in:
parent
b164582a09
commit
488fc92791
@ -30,7 +30,6 @@ DefaultSettings ()
|
|||||||
GCSettings.FourScore = 0;
|
GCSettings.FourScore = 0;
|
||||||
GCSettings.zapper = 0;
|
GCSettings.zapper = 0;
|
||||||
GCSettings.crosshair = 1;
|
GCSettings.crosshair = 1;
|
||||||
GCSettings.slimit = 1;
|
|
||||||
|
|
||||||
GCSettings.Zoom = 0; // zooming default off
|
GCSettings.Zoom = 0; // zooming default off
|
||||||
GCSettings.ZoomLevel = 1.0; // zoom amount
|
GCSettings.ZoomLevel = 1.0; // zoom amount
|
||||||
|
@ -65,7 +65,6 @@ struct SGCSettings{
|
|||||||
int FourScore;
|
int FourScore;
|
||||||
int zapper;
|
int zapper;
|
||||||
int crosshair;
|
int crosshair;
|
||||||
int slimit;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
void ExitToLoader();
|
void ExitToLoader();
|
||||||
|
@ -73,7 +73,7 @@ LoadManager ()
|
|||||||
static void
|
static void
|
||||||
VideoOptions ()
|
VideoOptions ()
|
||||||
{
|
{
|
||||||
int videomenuCount = 8;
|
int videomenuCount = 7;
|
||||||
char videomenu[][50] = {
|
char videomenu[][50] = {
|
||||||
|
|
||||||
"Video Rendering",
|
"Video Rendering",
|
||||||
@ -82,7 +82,6 @@ VideoOptions ()
|
|||||||
"Palette",
|
"Palette",
|
||||||
"Enable Zooming",
|
"Enable Zooming",
|
||||||
"Timing",
|
"Timing",
|
||||||
"8 Sprite Limit",
|
|
||||||
"Back to Preferences Menu"
|
"Back to Preferences Menu"
|
||||||
|
|
||||||
};
|
};
|
||||||
@ -123,9 +122,6 @@ VideoOptions ()
|
|||||||
sprintf (videomenu[5], "Timing - %s",
|
sprintf (videomenu[5], "Timing - %s",
|
||||||
GCSettings.timing == true ? " PAL" : "NTSC");
|
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);
|
ret = RunMenu (videomenu, videomenuCount, "Video Options", 20, -1);
|
||||||
|
|
||||||
switch (ret)
|
switch (ret)
|
||||||
@ -162,13 +158,8 @@ VideoOptions ()
|
|||||||
FCEUI_SetVidSystem(GCSettings.timing); // causes a small 'pop' in the audio
|
FCEUI_SetVidSystem(GCSettings.timing); // causes a small 'pop' in the audio
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 6: // 8 sprite limit
|
|
||||||
GCSettings.slimit ^=1;
|
|
||||||
FCEUI_DisableSpriteLimitation(GCSettings.slimit);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case -1: // Button B
|
case -1: // Button B
|
||||||
case 7:
|
case 6:
|
||||||
quit = 1;
|
quit = 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -558,7 +558,6 @@ void GetJoy()
|
|||||||
#ifdef HW_RVL
|
#ifdef HW_RVL
|
||||||
|| (wm_pb & WPAD_BUTTON_HOME)
|
|| (wm_pb & WPAD_BUTTON_HOME)
|
||||||
|| (wm_pb & WPAD_CLASSIC_BUTTON_HOME)
|
|| (wm_pb & WPAD_CLASSIC_BUTTON_HOME)
|
||||||
|| (wm_sx < -70)
|
|
||||||
#endif
|
#endif
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -157,7 +157,6 @@ preparePrefsData (int method)
|
|||||||
|
|
||||||
createXMLSetting("currpal", "Palette", toStr(GCSettings.currpal));
|
createXMLSetting("currpal", "Palette", toStr(GCSettings.currpal));
|
||||||
createXMLSetting("timing", "Timing", toStr(GCSettings.timing));
|
createXMLSetting("timing", "Timing", toStr(GCSettings.timing));
|
||||||
createXMLSetting("slimit", "8 Sprite Limit", toStr(GCSettings.slimit));
|
|
||||||
createXMLSetting("Zoom", "Zoom On/Off", toStr(GCSettings.Zoom));
|
createXMLSetting("Zoom", "Zoom On/Off", toStr(GCSettings.Zoom));
|
||||||
createXMLSetting("ZoomLevel", "Zoom Level", FtoStr(GCSettings.ZoomLevel));
|
createXMLSetting("ZoomLevel", "Zoom Level", FtoStr(GCSettings.ZoomLevel));
|
||||||
createXMLSetting("render", "Video Filtering", toStr(GCSettings.render));
|
createXMLSetting("render", "Video Filtering", toStr(GCSettings.render));
|
||||||
@ -309,7 +308,6 @@ decodePrefsData (int method)
|
|||||||
|
|
||||||
loadXMLSettingInt(&GCSettings.currpal, "currpal");
|
loadXMLSettingInt(&GCSettings.currpal, "currpal");
|
||||||
loadXMLSettingInt(&GCSettings.timing, "timing");
|
loadXMLSettingInt(&GCSettings.timing, "timing");
|
||||||
loadXMLSettingInt(&GCSettings.slimit, "slimit");
|
|
||||||
loadXMLSettingInt(&GCSettings.Zoom, "Zoom");
|
loadXMLSettingInt(&GCSettings.Zoom, "Zoom");
|
||||||
loadXMLSettingFloat(&GCSettings.ZoomLevel, "ZoomLevel");
|
loadXMLSettingFloat(&GCSettings.ZoomLevel, "ZoomLevel");
|
||||||
loadXMLSettingInt(&GCSettings.render, "render");
|
loadXMLSettingInt(&GCSettings.render, "render");
|
||||||
|
Loading…
Reference in New Issue
Block a user