menu tweaks, change default video mode

source/ngc/menu.cpp

@@ -1,5 +1,5 @@
 /****************************************************************************
- * Snes9x 1.50
+ * Snes9x 1.51
  *
  * Nintendo Wii/Gamecube Port
  *
@@ -213,6 +213,10 @@ PreferencesMenu ()
 		prefmenu[1][0] = '\0';
 		prefmenu[3][0] = '\0';
 
+		// don't allow original render mode if progressive video mode detected
+		if (GCSettings.render==0 && progressive)
+			GCSettings.render++;
+
 		if (GCSettings.AutoLoad == 0) sprintf (prefmenu[4],"Auto Load OFF");
 		else if (GCSettings.AutoLoad == 1) sprintf (prefmenu[4],"Auto Load SRAM");
 		else if (GCSettings.AutoLoad == 2) sprintf (prefmenu[4],"Auto Load SNAPSHOT");
@@ -241,14 +245,14 @@ PreferencesMenu ()
 			GCSettings.NGCZoom == true ? " ON" : "OFF");
 
 		if ( GCSettings.render == 0 )
-			sprintf (prefmenu[12], "Render Mode Original");
+			sprintf (prefmenu[12], "Video Rendering Original");
 		if ( GCSettings.render == 1 )
-			sprintf (prefmenu[12], "Render Mode Filtered");
+			sprintf (prefmenu[12], "Video Rendering Filtered");
 		if ( GCSettings.render == 2 )
-			sprintf (prefmenu[12], "Render Mode Unfiltered");
+			sprintf (prefmenu[12], "Video Rendering Unfiltered");
 
-		sprintf (prefmenu[13], "Widescreen %s",
+		sprintf (prefmenu[13], "Video Scaling %s",
-			GCSettings.widescreen == true ? "ON" : "OFF");
+			GCSettings.widescreen == true ? "16:9 Correction" : "Default");
 
 		ret = RunMenu (prefmenu, prefmenuCount, (char*)"Preferences", 16);
 
@@ -306,15 +310,12 @@ PreferencesMenu ()
 
 			case 12:
 				GCSettings.render++;
-				if (GCSettings.render > 2 ) GCSettings.render = 0;
+				if (GCSettings.render > 2 )
-				
+					GCSettings.render = 0;
-				extern bool progressive;
-				if (GCSettings.render==0 && progressive) GCSettings.render++;	// don't do original render mode if progressive video mode detected
 				break;
 
 			case 13:
 				GCSettings.widescreen ^= 1;
-				//if (!GCSettings.render) GCSettings.widescreen = 0;	// don't allow on original render modes
 				break;
 
 			case 14:

source/ngc/s9xconfig.cpp

@@ -1,13 +1,15 @@
 /****************************************************************************
- * Snes9x 1.50
+ * Snes9x 1.51
+ *
+ * Nintendo Wii/Gamecube Port
  *
- * Nintendo Gamecube Port
  * softdev July 2006
  * crunchy2 May 2007
+ * Tantric September 2008
  *
  * s9xconfig.cpp
  *
- * Configuration parameters have been moved here for easier maintenance.
+ * Configuration parameters are here for easy maintenance.
  * Refer to Snes9x.h for all combinations.
  * The defaults used here are taken directly from porting.html
  ****************************************************************************/
@@ -51,8 +53,8 @@ DefaultSettings ()
 	GCSettings.NGCZoom = 0;
 	GCSettings.VerifySaves = 0;
 
-	GCSettings.render = 0;
+	GCSettings.render = 2; // Unfiltered
-	GCSettings.widescreen = 0;
+	GCSettings.widescreen = 0; // no aspect ratio correction
 
 	GCSettings.Superscope = 0;
     GCSettings.Mouse = 0;

source/ngc/video.cpp

@@ -1,13 +1,14 @@
 /****************************************************************************
- * Snes9x 1.50
+ * Snes9x 1.51
  *
- * Nintendo Gamecube Video
+ * Nintendo Wii/Gamecube Port
- *
- * This is a modified renderer from the Genesis Plus Project.
- * Well - you didn't expect me to write another one did ya ? -;)
  *
  * softdev July 2006
  * crunchy2 May 2007
+ *
+ * video.cpp
+ *
+ * Video routines
  ****************************************************************************/
 #include <gccore.h>
 #include <ogcsys.h>
@@ -20,7 +21,6 @@
 #include "memmap.h"
 #include "aram.h"
 #include "snes9xGX.h"
-#include "video.h"
 
 #include "gui.h"
 
@@ -809,8 +809,6 @@ update_video (int width, int height)
 		oldvwidth = vwidth;
 		oldvheight = vheight;
 		CheckVideo = 0;
-
-		//clearscreen (); // this hack fixes my 'not updating scaling' problem
 	}
 
 	/*

source/ngc/video.h

@@ -1,17 +1,18 @@
 /****************************************************************************
- * Snes9x 1.50 
+ * Snes9x 1.51
  *
- * Nintendo Gamecube Video
+ * Nintendo Wii/Gamecube Port
- *
- * This is a modified renderer from the Genesis Plus Project.
- * Well - you didn't expect me to write another one did ya ? -;)
  *
  * softdev July 2006
+ *
+ * video.h
+ *
+ * Video routines
  ****************************************************************************/
 #ifndef _GCVIDEOH_
 
 #define _GCVIDEOH_
-//#include <gccore.h>
+
 #include <ogcsys.h>
 
 #include "snes9x.h"
@@ -26,4 +27,6 @@ void showscreen ();
 void zoom (float speed);
 void zoom_reset ();
 
+extern bool progressive;
+
 #endif