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

fix noteskin error if current game doesn't have a NoteSkin called "note"

Browse Source
This commit is contained in:
Chris Danford
2003-12-31 07:44:53 +00:00
parent ddbc750a49
commit 141ba141d0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteSkinManager.cpp
+1
View File
@@ -163,6 +163,7 @@ CString NoteSkinManager::GetMetric( CString sNoteSkinName, CString sButtonName,
{ {
sNoteSkinName.MakeLower(); sNoteSkinName.MakeLower();
CString sReturn; CString sReturn;
ASSERT( m_mapNameToData.find(sNoteSkinName) != m_mapNameToData.end() ); // this NoteSkin doesn't exist!
NoteSkinData& data = m_mapNameToData[sNoteSkinName]; NoteSkinData& data = m_mapNameToData[sNoteSkinName];
if( data.metrics.GetValue( sButtonName, sValue, sReturn ) ) if( data.metrics.GetValue( sButtonName, sValue, sReturn ) )
return sReturn; return sReturn;
stepmania/src/ScreenEdit.cpp
+4 -1
View File
@@ -297,7 +297,10 @@ ScreenEdit::ScreenEdit( CString sName ) : Screen( sName )
GAMESTATE->m_PlayerOptions[PLAYER_1].Init(); // don't allow weird options in editor. It doesn't handle reverse well. GAMESTATE->m_PlayerOptions[PLAYER_1].Init(); // don't allow weird options in editor. It doesn't handle reverse well.
GAMESTATE->m_PlayerOptions[PLAYER_1].m_sNoteSkin = "note"; // change noteskin back to default before loading player // Set NoteSkin to note if available.
// Change noteskin back to default before loading player.
if( NOTESKIN->DoesNoteSkinExist("note") )
GAMESTATE->m_PlayerOptions[PLAYER_1].m_sNoteSkin = "note";
GAMESTATE->ResetNoteSkins(); GAMESTATE->ResetNoteSkins();
m_Player.Load( PLAYER_1, &noteData, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); m_Player.Load( PLAYER_1, &noteData, NULL, NULL, NULL, NULL, NULL, NULL, NULL );