The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-26 04:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

update some strings

Browse Source
This commit is contained in:
dborth 2010-03-17 23:20:17 +00:00
parent 3e8072f22c
commit 5166ca2b61
4 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/ngc/fileop.cpp
View File

@ -352,7 +352,7 @@ bool MountDVD(bool silent)
if(silent) if(silent)
break; break;
retry = ErrorPromptRetry("Invalid DVD."); retry = ErrorPromptRetry("Unrecognized DVD format.");
} }
else else
{ {
@ -586,7 +586,6 @@ bool ParseDirEntries()
int int
ParseDirectory(bool waitParse) ParseDirectory(bool waitParse)
{ {
char msg[128];
int retry = 1; int retry = 1;
bool mounted = false; bool mounted = false;
@ -603,10 +602,7 @@ ParseDirectory(bool waitParse)
return -1; return -1;
if(dirIter == NULL) if(dirIter == NULL)
{ retry = ErrorPromptRetry("Error opening directory");
sprintf(msg, "Error opening %s", browser.dir);
retry = ErrorPromptRetry(msg);
}
} }
// if we can't open the dir, try higher levels // if we can't open the dir, try higher levels
@ -711,7 +707,7 @@ LoadSzFile(char * filepath, unsigned char * rbuffer)
} }
else else
{ {
ErrorPrompt("Error opening file"); ErrorPrompt("Error opening file!");
} }
// go back to checking if devices were inserted/removed // go back to checking if devices were inserted/removed

4
source/ngc/networkop.cpp
View File

@ -191,7 +191,6 @@ void InitializeNetwork(bool silent)
int retry = 1; int retry = 1;
char ip[16]; char ip[16];
char msg[150];
s32 initResult; s32 initResult;
if(!silent) if(!silent)
@ -217,8 +216,7 @@ void InitializeNetwork(bool silent)
if(networkInit || silent) if(networkInit || silent)
break; break;
sprintf(msg, "Unable to initialize network (Error #: %i)", initResult); retry = ErrorPromptRetry("Unable to initialize network!");
retry = ErrorPromptRetry(msg);
} }
// do not automatically attempt a reconnection // do not automatically attempt a reconnection

6
source/ngc/vbasupport.cpp
View File

@ -896,14 +896,12 @@ bool LoadVBAROM()
cartridgeType = 2; cartridgeType = 2;
else if(utilIsGBImage(zippedFilename)) else if(utilIsGBImage(zippedFilename))
cartridgeType = 1; cartridgeType = 1;
else { else
ErrorPrompt("Rom must be 1st file in zip, or unzipped!");
return false; return false;
} }
}
else // loading the file failed else // loading the file failed
{ {
ErrorPrompt("Empty or invalid zip file!"); ErrorPrompt("Empty or invalid ZIP file!");
return false; return false;
} }
} }

20
source/ngc/vmmem.cpp
View File

@ -274,7 +274,6 @@ static void VMInit( void )
int VMCPULoadROM() int VMCPULoadROM()
{ {
int res; int res;
char msg[512];
char filepath[MAXPATHLEN]; char filepath[MAXPATHLEN];
if(!MakeFilePath(filepath, FILE_ROM)) if(!MakeFilePath(filepath, FILE_ROM))
@ -283,7 +282,7 @@ int VMCPULoadROM()
// loading compressed files via VM is not supported // loading compressed files via VM is not supported
if(!utilIsGBAImage(filepath)) if(!utilIsGBAImage(filepath))
{ {
InfoPrompt("Compressed GBA files are not supported!"); ErrorPrompt("Compressed GBA files are not supported!");
return 0; return 0;
} }
@ -294,7 +293,7 @@ int VMCPULoadROM()
if (romfile == NULL) if (romfile == NULL)
{ {
InfoPrompt("Error opening file!"); ErrorPrompt("Error opening file!");
return 0; return 0;
} }
@ -308,8 +307,7 @@ int VMCPULoadROM()
res = fread(rom, 1, (1 << VMSHIFTBITS), romfile); res = fread(rom, 1, (1 << VMSHIFTBITS), romfile);
if ( res != (1 << VMSHIFTBITS ) ) if ( res != (1 << VMSHIFTBITS ) )
{ {
sprintf(msg, "Error reading file! %i \n",res); ErrorPrompt("Error reading file!");
InfoPrompt(msg);
VMClose(); VMClose();
return 0; return 0;
} }
@ -338,12 +336,10 @@ int VMCPULoadROM()
static void VMNewPage( int pageid ) static void VMNewPage( int pageid )
{ {
int res = fseek( romfile, pageid << VMSHIFTBITS, SEEK_SET ); int res = fseek( romfile, pageid << VMSHIFTBITS, SEEK_SET );
char msg[512];
if (res) // fseek returns non-zero on a failure if (res) // fseek returns non-zero on a failure
{ {
sprintf(msg, "Seek error! - Offset %d / %08x %d\n", pageid, pageid << VMSHIFTBITS, res); ErrorPrompt("Seek error!");
InfoPrompt(msg);
VMClose(); VMClose();
ExitApp(); ExitApp();
} }
@ -366,7 +362,6 @@ u32 VMRead32( u32 address )
} }
int pageid = address >> VMSHIFTBITS; int pageid = address >> VMSHIFTBITS;
char msg[512];
switch( vmpage[pageid].pagetype ) switch( vmpage[pageid].pagetype )
{ {
@ -377,8 +372,7 @@ u32 VMRead32( u32 address )
return READ32LE( vmpage[pageid].pageptr + ( address & VMSHIFTMASK ) ); return READ32LE( vmpage[pageid].pageptr + ( address & VMSHIFTMASK ) );
default: default:
sprintf(msg, "VM32 : Unknown page type! (%d) [%d]", vmpage[pageid].pagetype, pageid); ErrorPrompt("VM32: Unknown page type!");
InfoPrompt(msg);
VMClose(); VMClose();
ExitApp(); ExitApp();
return 0; return 0;
@ -408,7 +402,7 @@ u16 VMRead16( u32 address )
return READ16LE( vmpage[pageid].pageptr + ( address & VMSHIFTMASK ) ); return READ16LE( vmpage[pageid].pageptr + ( address & VMSHIFTMASK ) );
default: default:
InfoPrompt("VM16 : Unknown page type!"); ErrorPrompt("VM16: Unknown page type!");
VMClose(); VMClose();
ExitApp(); ExitApp();
return 0; return 0;
@ -438,7 +432,7 @@ u8 VMRead8( u32 address )
return (u8)vmpage[pageid].pageptr[ (address & VMSHIFTMASK) ]; return (u8)vmpage[pageid].pageptr[ (address & VMSHIFTMASK) ];
default: default:
InfoPrompt("VM8 : Unknown page type!"); ErrorPrompt("VM8: Unknown page type!");
VMClose(); VMClose();
ExitApp(); ExitApp();
return 0; return 0;