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

m_NotesType => m_StepsType

Browse Source 
split NoteDataUtil to sep file
This commit is contained in:
Chris Danford
2003-08-07 06:36:34 +00:00
parent f5cd95b4f9
commit 1a0d83cbc0
35 changed files with 1063 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderDWI.cpp
+8 -8
View File
@@ -106,7 +106,7 @@ bool DWILoader::LoadFromDWITokens(
{
LOG->Trace( "Steps::LoadFromDWITokens()" );
out.m_NotesType = STEPS_TYPE_INVALID;
out.m_StepsType = STEPS_TYPE_INVALID;
sStepData1.Replace( "\n", "" );
sStepData1.Replace( "\r", "" );
@@ -115,19 +115,19 @@ bool DWILoader::LoadFromDWITokens(
sStepData2.Replace( "\r", "" );
sStepData2.Replace( " ", "" );
if( sMode == "SINGLE" ) out.m_NotesType = STEPS_TYPE_DANCE_SINGLE;
else if( sMode == "DOUBLE" ) out.m_NotesType = STEPS_TYPE_DANCE_DOUBLE;
else if( sMode == "COUPLE" ) out.m_NotesType = STEPS_TYPE_DANCE_COUPLE;
else if( sMode == "SOLO" ) out.m_NotesType = STEPS_TYPE_DANCE_SOLO;
if( sMode == "SINGLE" ) out.m_StepsType = STEPS_TYPE_DANCE_SINGLE;
else if( sMode == "DOUBLE" ) out.m_StepsType = STEPS_TYPE_DANCE_DOUBLE;
else if( sMode == "COUPLE" ) out.m_StepsType = STEPS_TYPE_DANCE_COUPLE;
else if( sMode == "SOLO" ) out.m_StepsType = STEPS_TYPE_DANCE_SOLO;
else
{
ASSERT(0); // Unrecognized DWI notes format
out.m_NotesType = STEPS_TYPE_DANCE_SINGLE;
out.m_StepsType = STEPS_TYPE_DANCE_SINGLE;
}
g_mapDanceNoteToNoteDataColumn.clear();
switch( out.m_NotesType )
switch( out.m_StepsType )
{
case STEPS_TYPE_DANCE_SINGLE:
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0;
@@ -457,7 +457,7 @@ bool DWILoader::LoadFromDWIFile( CString sPath, Song &out )
(iNumParams==5) ? sParams[4] : "",
*pNewNotes
);
if(pNewNotes->m_NotesType != STEPS_TYPE_INVALID)
if(pNewNotes->m_StepsType != STEPS_TYPE_INVALID)
out.m_apNotes.push_back( pNewNotes );
else
delete pNewNotes;