The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-10-01 19:29:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix widescreen setting

Browse Source
This commit is contained in:
giantpune 2010-09-20 03:03:38 +00:00
parent f3ef9104b1
commit 4e78cbb37d
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/patches/fst.c
View File

@ -566,8 +566,7 @@ int ocarina_load_code( u8 *id )
code_buf = ( u8* ) malloc( filesize ); code_buf = ( u8* ) malloc( filesize );
if ( !code_buf ) if ( !code_buf )
{ {
gprintf( "Ocarina: No codes found" ); gprintf( "Ocarina: No codes found\n" );
printf( "\n" );
fclose( fp ); fclose( fp );
return 0; return 0;
} }
@ -578,8 +577,7 @@ int ocarina_load_code( u8 *id )
if ( code_size <= 0 ) if ( code_size <= 0 )
{ {
gprintf( "Ocarina: could not read file." ); gprintf( "Ocarina: could not read file.\n" );
gprintf( "\n" );
free( code_buf ); free( code_buf );
code_buf = NULL; code_buf = NULL;
code_size = 0; code_size = 0;
@ -588,16 +586,14 @@ int ocarina_load_code( u8 *id )
if ( code_size > ( s32 )codelistend - ( s32 )codelist ) if ( code_size > ( s32 )codelistend - ( s32 )codelist )
{ {
gprintf( "Ocarina: Too many codes found" ); gprintf( "Ocarina: Too many codes found\n" );
gprintf( "\n" );
free( code_buf ); free( code_buf );
code_buf = NULL; code_buf = NULL;
code_size = 0; code_size = 0;
return 0; return 0;
} }
gprintf( "Ocarina: Codes found." ); gprintf( "Ocarina: Codes found.\n" );
gprintf( "\n" );
return code_size; return code_size;
} }

9
source/settings/CSettings.cpp
View File

@ -75,7 +75,6 @@ void CSettings::SetDefault()
sinfo = on; sinfo = on;
rumble = RumbleOn; rumble = RumbleOn;
volume = 80; volume = 80;
widescreen = 0;
sfxvolume = 80; sfxvolume = 80;
gamesoundvolume = 80; gamesoundvolume = 80;
tooltips = TooltipsOn; tooltips = TooltipsOn;
@ -121,6 +120,7 @@ void CSettings::SetDefault()
memcpy( Parental.pin, buf + 3, 4 ); memcpy( Parental.pin, buf + 3, 4 );
memcpy( Parental.answer, buf + 8, 32 ); memcpy( Parental.answer, buf + 8, 32 );
} }
widescreen = CONF_GetAspectRatio();
godmode = ( Parental.enabled == 0 ) ? 1 : 0; godmode = ( Parental.enabled == 0 ) ? 1 : 0;
CFG_DefaultTheme(); CFG_DefaultTheme();
@ -203,7 +203,7 @@ bool CSettings::Save()
fprintf(file, "fullcopy = %d\n ", fullcopy ); fprintf(file, "fullcopy = %d\n ", fullcopy );
fprintf(file, "beta_upgrades = %d\n ", beta_upgrades ); fprintf(file, "beta_upgrades = %d\n ", beta_upgrades );
fprintf(file, "returnTo = %s\n ", returnTo ); 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); fclose(file);
return true; return true;
@ -482,11 +482,6 @@ bool CSettings::SetSetting(char *name, char *value)
FatInstallToDir = i; FatInstallToDir = i;
return true; 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) { else if (strcmp(name, "beta_upgrades") == 0) {
if (sscanf(value, "%d", &i) == 1) if (sscanf(value, "%d", &i) == 1)
beta_upgrades = i; beta_upgrades = i;

6
source/usbloader/disc.c
View File

@ -331,7 +331,7 @@ s32 Disc_BootPartition( u64 offset, char * dolpath, u8 videoselected, u8 cheat,
if ( cheat ) if ( cheat )
{ {
/* OCARINA STUFF - FISHEARS*/ // OCARINA STUFF - FISHEARS
if ( ocarina_load_code( ( u8 * ) gameid ) > 0 ) if ( ocarina_load_code( ( u8 * ) gameid ) > 0 )
{ {
ocarina_do_code(); ocarina_do_code();
@ -349,8 +349,6 @@ s32 Disc_BootPartition( u64 offset, char * dolpath, u8 videoselected, u8 cheat,
/* Set time */ /* Set time */
__Disc_SetTime(); __Disc_SetTime();
//gprintf("\n\tDe-init SD & USB");
/* Disconnect Wiimote */ /* Disconnect Wiimote */
WPAD_Flush( 0 ); WPAD_Flush( 0 );
WPAD_Disconnect( 0 ); WPAD_Disconnect( 0 );
@ -360,7 +358,7 @@ s32 Disc_BootPartition( u64 offset, char * dolpath, u8 videoselected, u8 cheat,
VIDEO_SetBlack( TRUE ); VIDEO_SetBlack( TRUE );
VIDEO_Flush(); VIDEO_Flush();
VIDEO_WaitVSync(); VIDEO_WaitVSync();
gprintf( "\n\nUSB Loader GX is done.\n\n" ); gprintf( "USB Loader GX is done.\n" );
/* Shutdown IOS subsystems */ /* Shutdown IOS subsystems */
// fix for PeppaPig (from NeoGamma) // fix for PeppaPig (from NeoGamma)