add option for only horizontal cropping, change GC home trigger to A+B+Z+Start

This commit is contained in:
dborth 2009-01-26 06:36:19 +00:00
parent 3bb9236db0
commit d1b4a4ae5b
3 changed files with 16 additions and 7 deletions

View File

@ -703,9 +703,14 @@ void RenderFrame(unsigned char *XBuf)
int width, height;
// 0 = off, 1 = vertical, 2 = both
u8 borderheight = GCSettings.hideoverscan < 1 ? 0 : 8;
u8 borderwidth = GCSettings.hideoverscan < 2 ? 0 : 8;
u8 borderheight = 0;
u8 borderwidth = 0;
// 0 = off, 1 = vertical, 2 = horizontal, 3 = both
if(GCSettings.hideoverscan == 1 || GCSettings.hideoverscan == 3)
borderheight = 8;
if(GCSettings.hideoverscan >= 2)
borderwidth = 8;
u16 *texture = (unsigned short *)texturemem + (borderheight << 8) + (borderwidth << 2);
u8 *src1 = XBuf + (borderheight << 8) + borderwidth;

View File

@ -111,9 +111,11 @@ VideoOptions ()
if (GCSettings.hideoverscan == 0)
sprintf (videomenu[2], "Video Cropping Off");
if (GCSettings.hideoverscan == 1)
sprintf (videomenu[2], "Video Cropping Hide Vertical");
sprintf (videomenu[2], "Video Cropping Vertical");
if (GCSettings.hideoverscan == 2)
sprintf (videomenu[2], "Video Cropping Hide All");
sprintf (videomenu[2], "Video Cropping Horizontal");
if (GCSettings.hideoverscan == 3)
sprintf (videomenu[2], "Video Cropping Both");
sprintf (videomenu[3], "Palette - %s",
GCSettings.currpal ? palettes[GCSettings.currpal-1].name : "Default");
@ -142,7 +144,7 @@ VideoOptions ()
case 2:
GCSettings.hideoverscan++;
if (GCSettings.hideoverscan > 2)
if (GCSettings.hideoverscan > 3)
GCSettings.hideoverscan = 0;
break;

View File

@ -556,7 +556,9 @@ void GetJoy()
}
// request to go back to menu
if ((gc_px < -70) || ((jp & PAD_BUTTON_START) && (jp & PAD_BUTTON_A))
if ((gc_px < -70) ||
((jp & PAD_BUTTON_START) && (jp & PAD_BUTTON_A) &&
(jp & PAD_BUTTON_B) && (jp & PAD_TRIGGER_Z))
#ifdef HW_RVL
|| (wm_pb & WPAD_BUTTON_HOME)
|| (wm_pb & WPAD_CLASSIC_BUTTON_HOME)