move NOTE_COLOR_IMAGES into a struct so that it's not duplicated
This commit is contained in:
+14
-18
@@ -1,5 +1,6 @@
|
||||
#include "global.h"
|
||||
#include "NoteTypes.h"
|
||||
#include "RageUtil.h"
|
||||
|
||||
TapNote TAP_EMPTY ( TapNote::empty, TapNote::original, "", 0, false, 0 );
|
||||
TapNote TAP_ORIGINAL_TAP ( TapNote::tap, TapNote::original, "", 0, false, 0 );
|
||||
@@ -10,6 +11,19 @@ TapNote TAP_ORIGINAL_AUTO_KEYSOUND ( TapNote::autoKeysound,TapNote::original, ""
|
||||
TapNote TAP_ADDITION_TAP ( TapNote::tap, TapNote::addition, "", 0, false, 0 );
|
||||
TapNote TAP_ADDITION_MINE ( TapNote::mine, TapNote::addition, "", 0, false, 0 );
|
||||
|
||||
static const CString NoteTypeNames[NUM_NOTE_TYPES] = {
|
||||
"4th",
|
||||
"8th",
|
||||
"12th",
|
||||
"16th",
|
||||
"24th",
|
||||
"32nd",
|
||||
"48th",
|
||||
"64th",
|
||||
"192nd",
|
||||
};
|
||||
XToString( NoteType, NUM_NOTE_TYPES );
|
||||
|
||||
float NoteTypeToBeat( NoteType nt )
|
||||
{
|
||||
switch( nt )
|
||||
@@ -46,24 +60,6 @@ NoteType GetNoteType( int row )
|
||||
else return NOTE_TYPE_INVALID;
|
||||
};
|
||||
|
||||
CString NoteTypeToString( NoteType nt )
|
||||
{
|
||||
switch( nt )
|
||||
{
|
||||
case NOTE_TYPE_4TH: return "4th";
|
||||
case NOTE_TYPE_8TH: return "8th";
|
||||
case NOTE_TYPE_12TH: return "12th";
|
||||
case NOTE_TYPE_16TH: return "16th";
|
||||
case NOTE_TYPE_24TH: return "24th";
|
||||
case NOTE_TYPE_32ND: return "32nd";
|
||||
case NOTE_TYPE_48TH: return "48th";
|
||||
case NOTE_TYPE_64TH: return "64th";
|
||||
case NOTE_TYPE_192ND: // fall through
|
||||
case NOTE_TYPE_INVALID: return "192nd";
|
||||
default: ASSERT(0); return "";
|
||||
}
|
||||
}
|
||||
|
||||
NoteType BeatToNoteType( float fBeat )
|
||||
{
|
||||
return GetNoteType( BeatToNoteRow(fBeat) );
|
||||
|
||||
Reference in New Issue
Block a user