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

NUM_NOTE_TYPES -> NUM_NoteType

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-02 08:43:05 +00:00
parent f873e9bd84
commit 8bd5e174f5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataUtil.cpp
+2 -2
View File
@@ -15,7 +15,7 @@ NoteType NoteDataUtil::GetSmallestNoteTypeForMeasure( const NoteData &n, int iMe
// probe to find the smallest note type // probe to find the smallest note type
NoteType nt; NoteType nt;
for( nt=(NoteType)0; nt<NUM_NOTE_TYPES; nt=NoteType(nt+1) ) // for each NoteType, largest to largest for( nt=(NoteType)0; nt<NUM_NoteType; nt=NoteType(nt+1) ) // for each NoteType, largest to largest
{ {
float fBeatSpacing = NoteTypeToBeat( nt ); float fBeatSpacing = NoteTypeToBeat( nt );
int iRowSpacing = int(roundf( fBeatSpacing * ROWS_PER_BEAT )); int iRowSpacing = int(roundf( fBeatSpacing * ROWS_PER_BEAT ));
@@ -40,7 +40,7 @@ NoteType NoteDataUtil::GetSmallestNoteTypeForMeasure( const NoteData &n, int iMe
break; // stop searching. We found the smallest NoteType break; // stop searching. We found the smallest NoteType
} }
if( nt == NUM_NOTE_TYPES ) // we didn't find one if( nt == NUM_NoteType ) // we didn't find one
return NOTE_TYPE_INVALID; // well-formed notes created in the editor should never get here return NOTE_TYPE_INVALID; // well-formed notes created in the editor should never get here
else else
return nt; return nt;
stepmania/src/NoteTypes.cpp
+2 -2
View File
@@ -26,9 +26,9 @@ static const char *NoteTypeNames[] = {
"64th", "64th",
"192nd", "192nd",
}; };
XToString( NoteType, NUM_NOTE_TYPES ); XToString( NoteType, NUM_NoteType );
LuaXToString( NoteType ) LuaXToString( NoteType )
LuaXType( NoteType, NUM_NOTE_TYPES , "NOTE_TYPE_", true ) LuaXType( NoteType, NUM_NoteType, "NOTE_TYPE_", true )
float NoteTypeToBeat( NoteType nt ) float NoteTypeToBeat( NoteType nt )
{ {
stepmania/src/NoteTypes.h
+1 -1
View File
@@ -193,7 +193,7 @@ enum NoteType
NOTE_TYPE_48TH, // forty-eighth note NOTE_TYPE_48TH, // forty-eighth note
NOTE_TYPE_64TH, // sixty-fourth note NOTE_TYPE_64TH, // sixty-fourth note
NOTE_TYPE_192ND, NOTE_TYPE_192ND,
NUM_NOTE_TYPES, NUM_NoteType,
NOTE_TYPE_INVALID NOTE_TYPE_INVALID
}; };
const RString& NoteTypeToString( NoteType nt ); const RString& NoteTypeToString( NoteType nt );