From 4e78cbb37d1c30585c357bdd2d6b8c48eeb95bbe Mon Sep 17 00:00:00 2001
From: giantpune <giantpune@gmail.com>
Date: Mon, 20 Sep 2010 03:03:38 +0000
Subject: [PATCH] * fix widescreen setting

---
 source/patches/fst.c          | 12 ++++--------
 source/settings/CSettings.cpp |  9 ++-------
 source/usbloader/disc.c       |  6 ++----
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/source/patches/fst.c b/source/patches/fst.c
index 123be866..08505087 100644
--- a/source/patches/fst.c
+++ b/source/patches/fst.c
@@ -566,8 +566,7 @@ int ocarina_load_code( u8 *id )
     code_buf = ( u8* ) malloc( filesize );
     if ( !code_buf )
     {
-        gprintf( "Ocarina: No codes found" );
-        printf( "\n" );
+	gprintf( "Ocarina: No codes found\n" );
         fclose( fp );
         return 0;
     }
@@ -578,8 +577,7 @@ int ocarina_load_code( u8 *id )
 
     if ( code_size <= 0 )
     {
-        gprintf( "Ocarina: could not read file." );
-        gprintf( "\n" );
+	gprintf( "Ocarina: could not read file.\n" );
         free( code_buf );
         code_buf = NULL;
         code_size = 0;
@@ -588,16 +586,14 @@ int ocarina_load_code( u8 *id )
 
     if ( code_size > ( s32 )codelistend - ( s32 )codelist )
     {
-        gprintf( "Ocarina: Too many codes found" );
-        gprintf( "\n" );
+	gprintf( "Ocarina: Too many codes found\n" );
         free( code_buf );
         code_buf = NULL;
         code_size = 0;
         return 0;
     }
 
-    gprintf( "Ocarina: Codes found." );
-    gprintf( "\n" );
+    gprintf( "Ocarina: Codes found.\n" );
 
     return code_size;
 }
diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp
index b8514f6c..2f0dbdda 100644
--- a/source/settings/CSettings.cpp
+++ b/source/settings/CSettings.cpp
@@ -75,7 +75,6 @@ void CSettings::SetDefault()
     sinfo = on;
     rumble = RumbleOn;
     volume = 80;
-    widescreen = 0;
     sfxvolume = 80;
     gamesoundvolume = 80;
     tooltips = TooltipsOn;
@@ -121,6 +120,7 @@ void CSettings::SetDefault()
         memcpy( Parental.pin, buf + 3, 4 );
         memcpy( Parental.answer, buf + 8, 32 );
     }
+    widescreen = CONF_GetAspectRatio();
     godmode = ( Parental.enabled == 0 ) ? 1 : 0;
 
     CFG_DefaultTheme();
@@ -203,7 +203,7 @@ bool CSettings::Save()
     fprintf(file, "fullcopy = %d\n ", fullcopy );
     fprintf(file, "beta_upgrades = %d\n ", beta_upgrades );
     fprintf(file, "returnTo = %s\n ", returnTo );
-    fprintf(file, "widescreen = %d\n ", widescreen);
+    //fprintf(file, "widescreen = %d\n ", widescreen);// no need to save this to the settings.  it is determined by the CONF_ stuff and there is no way to adjust it in the gui
 	fclose(file);
 
 	return true;
@@ -482,11 +482,6 @@ bool CSettings::SetSetting(char *name, char *value)
 			FatInstallToDir = i;
 		return true;
 	}
-	else if (strcmp(name, "widescreen") == 0) {
-		if (sscanf(value, "%d", &i) == 1)
-			widescreen = i;
-		return true;
-	}
 	else if (strcmp(name, "beta_upgrades") == 0) {
 		if (sscanf(value, "%d", &i) == 1)
 			beta_upgrades = i;
diff --git a/source/usbloader/disc.c b/source/usbloader/disc.c
index 5d974523..8128c50b 100644
--- a/source/usbloader/disc.c
+++ b/source/usbloader/disc.c
@@ -331,7 +331,7 @@ s32 Disc_BootPartition( u64 offset, char * dolpath, u8 videoselected, u8 cheat,
 
     if ( cheat )
     {
-        /* OCARINA STUFF - FISHEARS*/
+	// OCARINA STUFF - FISHEARS
         if ( ocarina_load_code( ( u8 * ) gameid ) > 0 )
         {
             ocarina_do_code();
@@ -349,8 +349,6 @@ s32 Disc_BootPartition( u64 offset, char * dolpath, u8 videoselected, u8 cheat,
     /* Set time */
     __Disc_SetTime();
 
-    //gprintf("\n\tDe-init SD & USB");
-
     /* Disconnect Wiimote */
     WPAD_Flush( 0 );
     WPAD_Disconnect( 0 );
@@ -360,7 +358,7 @@ s32 Disc_BootPartition( u64 offset, char * dolpath, u8 videoselected, u8 cheat,
     VIDEO_SetBlack( TRUE );
     VIDEO_Flush();
     VIDEO_WaitVSync();
-    gprintf( "\n\nUSB Loader GX is done.\n\n" );
+    gprintf( "USB Loader GX is done.\n" );
 
     /* Shutdown IOS subsystems */
     // fix for PeppaPig (from NeoGamma)