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

Don't crash if a BMS file doesn't have a #player tag.

Browse Source 
When a case is expected to never happen, use ASSERT(0), not
a throw.  That way, if it does, we get a full crash dump.

file.bad() is not equivalent to !file.good(); usually you want the latter
(my bug)
This commit is contained in:
Glenn Maynard
2003-07-12 19:06:04 +00:00
parent deb07f48a4
commit 51ac4509b1
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderBMS.cpp
+18 -8
View File
@@ -68,7 +68,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out )
pNoteData->SetNumTracks( MAX_NOTE_TRACKS );
ifstream file(sPath);
if( file.bad() )
if( !file.good() )
RageException::Throw( "Failed to open %s for reading.", sPath.c_str() );
CString line;
@@ -117,7 +117,9 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out )
out.m_NotesType = NOTES_TYPE_DANCE_DOUBLE;
break;
default:
RageException::Throw( "Invalid value '%d' for '#player'", atoi(value_data) );
LOG->Warn( "Invalid value '%d' for '#player'", atoi(value_data) );
delete pNoteData;
return false;
}
}
if( -1 != value_name.Find("#title") )
@@ -192,6 +194,13 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out )
}
// we're done reading in all of the BMS values
if( out.m_NotesType )
{
LOG->Warn("Couldn't determine note types of file '%s'", sPath.c_str() );
delete pNoteData;
return false;
}
int iNumNewTracks = GameManager::NotesTypeToNumTracks( out.m_NotesType );
int iTransformNewToOld[MAX_NOTE_TRACKS];
@@ -227,7 +236,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out )
iTransformNewToOld[5] = DANCE_NOTE_PAD1_RIGHT;
break;
default:
RageException::Throw( "Invalid NotesType." );
ASSERT(0);
}
NoteData* pNoteData2 = new NoteData;
@@ -256,8 +265,9 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
CStringArray arrayBMSFileNames;
GetApplicableFiles( sDir, arrayBMSFileNames );
if( arrayBMSFileNames.empty() )
RageException::Throw( "Couldn't find any BMS files in '%s'", sDir.c_str() );
/* We should have at least one; if we had none, we shouldn't have been
* called to begin with. */
ASSERT( arrayBMSFileNames.size() );
// load the Notes from the rest of the BMS files
unsigned i;
@@ -276,7 +286,7 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
CString sPath = out.GetSongDir() + arrayBMSFileNames[0];
ifstream file(sPath);
if( file.bad() )
if( !file.good() )
RageException::Throw( "Failed to open %s for reading.", sPath.c_str() );
CString line;
@@ -415,7 +425,7 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
// open the song file again and and look for this tag's value
ifstream file(sPath);
if( file.bad() )
if( !file.good() )
RageException::Throw( "Failed to open %s for reading.", sPath.c_str() );
CString line;
@@ -477,7 +487,7 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
// open the song file again and and look for this tag's value
ifstream file(sPath);
if( file.bad() )
if( !file.good() )
RageException::Throw( "Failed to open %s for reading.", sPath.c_str() );
CString line;