actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

error check

Browse Source
This commit is contained in:
Glenn Maynard
2004-06-06 21:04:48 +00:00
parent fa114e148a
commit ae99f03a4b
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+6 -1
View File
@@ -1582,7 +1582,12 @@ void GameState::StoreRankingName( PlayerNumber pn, CString name )
while (!file.AtEOF()) while (!file.AtEOF())
{ {
line = file.GetLine(); if( file.GetLine( line ) == -1 )
{
LOG->Warn( "Error reading \"%s\": %s", NAMES_BLACKLIST_FILE, file.GetError().c_str() );
break;
}
line.MakeUpper(); line.MakeUpper();
if( !line.empty() && name.Find(line) != -1 ) // name contains a bad word if( !line.empty() && name.Find(line) != -1 ) // name contains a bad word
{ {
stepmania/src/NotesLoaderBMS.cpp
+21 -7
View File
@@ -178,7 +178,14 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
while( !file.AtEOF() ) while( !file.AtEOF() )
{ {
CString line = file.GetLine(); CString line;
if( file.GetLine( line ) == -1 )
{
LOG->Warn( "Error reading \"%s\": %s", sPath.c_str(), file.GetError().c_str() );
delete pNoteData;
return false;
}
StripCrnl(line); StripCrnl(line);
CString value_name; // fill these in CString value_name; // fill these in
CString value_data; CString value_data;
@@ -463,13 +470,18 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
CString sPath = out.GetSongDir() + arrayBMSFileNames[0]; CString sPath = out.GetSongDir() + arrayBMSFileNames[0];
RageFile file(sPath); RageFile file;
if( !file.Open(sPath) )
if (!file.IsOpen())
RageException::Throw( "Failed to open %s for reading.", sPath.c_str() ); RageException::Throw( "Failed to open %s for reading.", sPath.c_str() );
while (!file.AtEOF()) while (!file.AtEOF())
{ {
CString line = file.GetLine(); CString line;
if( file.GetLine( line ) == -1 )
{
LOG->Warn( "Error reading \"%s\": %s", sPath.c_str(), file.GetError().c_str() );
return false;
}
StripCrnl(line); StripCrnl(line);
CString value_name; // fill these in CString value_name; // fill these in
CString value_data; CString value_data;
@@ -601,7 +613,8 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
RageException::Throw( "Failed to open %s for reading.", sPath.c_str() ); RageException::Throw( "Failed to open %s for reading.", sPath.c_str() );
while (!file.AtEOF()) while (!file.AtEOF())
{ {
CString line = file.GetLine(); CString line;
file.GetLine( line );
StripCrnl(line); StripCrnl(line);
CString value_name; // fill these in CString value_name; // fill these in
CString value_data; CString value_data;
@@ -659,7 +672,8 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
RageException::Throw( "Failed to open %s for reading.", sPath.c_str() ); RageException::Throw( "Failed to open %s for reading.", sPath.c_str() );
while (!file.AtEOF()) while (!file.AtEOF())
{ {
CString line = file.GetLine(); CString line;
file.GetLine( line );
StripCrnl(line); StripCrnl(line);
CString value_name; // fill these in CString value_name; // fill these in
CString value_data; CString value_data;