Vita: - disabled the menu entries 'screenwidth' and 'stylus offset' t…

…hat did nothing on the Vita. To show the borders in overscan games like Settlers, simply use the menu option 'Preset Width' and set it to >320 for lores, (or >640 for hires). There are choices 352, 384, 704 and 768 that cover the full overscan range.
rsn8887 · Jan 4, 2017 · d69bb9c · d69bb9c
1 parent 30ac2af
commit d69bb9c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/gp2x/menu/menu_display.cpp b/src/gp2x/menu/menu_display.cpp
@@ -53,7 +53,9 @@ enum {
 	MENUDISPLAY_PRESETWIDTH,
 	MENUDISPLAY_PRESETHEIGHT,
 	MENUDISPLAY_DISPLINES,
+#ifndef __PSP2__ //screenwidth has no meaning on Vita and is never used
 	MENUDISPLAY_SCREENWIDTH,
+#endif
 	MENUDISPLAY_VERTPOS,
 	MENUDISPLAY_CUTLEFT,
 	MENUDISPLAY_CUTRIGHT,
@@ -146,7 +148,7 @@ static void draw_displayMenu(int c)
 		write_text(tabstop3,menuLine,value);
 	else
 		write_text_inv(tabstop3,menuLine,value);
-
+#ifndef __PSP2__
 	// MENUDISPLAY_SCREENWIDTH
 	menuLine+=2;
 	write_text(leftMargin,menuLine,"Screen Width");
@@ -155,7 +157,7 @@ static void draw_displayMenu(int c)
 		write_text(tabstop3,menuLine,value);
 	else
 		write_text_inv(tabstop3,menuLine,value);
-
+#endif
 	// MENUDISPLAY_VERTPOS
 	menuLine+=2;
 	write_text(leftMargin,menuLine,"Vertical Position");
@@ -481,6 +483,7 @@ static int key_displayMenu(int *c)
 					mainMenu_displayedLines++;
 			}
 			break;
+#ifndef __PSP2__
 		case MENUDISPLAY_SCREENWIDTH:
 			if (left)
 			{
@@ -495,6 +498,7 @@ static int key_displayMenu(int *c)
 					screenWidth=800;
 			}
 			break;
+#endif
 		case MENUDISPLAY_VERTPOS:
 			if (left)
 			{

diff --git a/src/gp2x/menu/menu_misc.cpp b/src/gp2x/menu/menu_misc.cpp
@@ -77,7 +77,9 @@ enum {
 	MENUMISC_AUTOFIRE,
 	MENUMISC_STATUSLINE,
 	MENUMISC_MOUSEMULTIPLIER,
+#ifndef __PSP2__ // No stylus on Vita
 	MENUMISC_STYLUSOFFSET,
+#endif
 #ifdef __PSP2__
 	MENUMISC_DEADZONE,
 #else
@@ -380,7 +382,7 @@ static void draw_miscMenu(int c)
 		write_text_inv(tabstop9,menuLine,text_str_4x);
 	else
 		write_text(tabstop9,menuLine,text_str_4x);
-
+#ifndef __PSP2__
 	// MENUMISC_STYLUSOFFSET
 	menuLine+=2;
 	write_text(leftMargin,menuLine,text_str_stylus_offset);
@@ -409,6 +411,7 @@ static void draw_miscMenu(int c)
 		write_text_inv(tabstop9,menuLine,text_str_8px);
 	else
 		write_text(tabstop9,menuLine,text_str_8px);
+#endif //__PSP2__
 #ifdef __PSP2__
 	//Analog Stick Deadzone settings on Vita
 	//MENUMISC_DEADZONE
@@ -739,6 +742,7 @@ static int key_miscMenu(int *c)
 						mainMenu_mouseMultiplier = 50;
 				}
 				break;
+#ifndef __PSP2__
 			case MENUMISC_STYLUSOFFSET:
 				if (left)
 				{
@@ -767,6 +771,8 @@ static int key_miscMenu(int *c)
 						mainMenu_stylusOffset = 0;
 				}
 				break;
+#endif //__PSP2__
+
 #ifdef __PSP2__
 			case MENUMISC_DEADZONE:
 				if (left)