diff --git a/src/ColumnCues.cpp b/src/ColumnCues.cpp index ffeacfe4df..ddd28dec8e 100644 --- a/src/ColumnCues.cpp +++ b/src/ColumnCues.cpp @@ -26,13 +26,13 @@ void ColumnCue::CalculateColumnCues(const NoteData &in, std::vector & curr_row = curr_note.Row(); } - if (curr_note->type == TapNoteType_Tap || curr_note->type == TapNoteType_HoldHead) + + if (curr_note->type == TapNoteType_Tap + || curr_note->type == TapNoteType_HoldHead + || curr_note->type == TapNoteType_Mine + || curr_note->type == TapNoteType_Lift) { - currentCue.columns.push_back(ColumnCueColumn(curr_note.Track() + 1, false)); - } - else if(curr_note->type == TapNoteType_Mine) - { - currentCue.columns.push_back(ColumnCueColumn(curr_note.Track() + 1, true)); + currentCue.columns.push_back(ColumnCueColumn(curr_note.Track() + 1, curr_note->type)); } ++curr_note; diff --git a/src/ColumnCues.h b/src/ColumnCues.h index e02c490bc7..7f5df83e2b 100644 --- a/src/ColumnCues.h +++ b/src/ColumnCues.h @@ -2,6 +2,8 @@ #define COLUMN_CUES_H #include "GameConstantsAndTypes.h" +#include "NoteTypes.h" + class NoteData; /* ColumnCues are used to indicate to the player which column the next note will occur @@ -11,16 +13,16 @@ class NoteData; struct ColumnCueColumn { int colNum; - bool isMine; + TapNoteType noteType; ColumnCueColumn() { colNum = 0; - isMine = false; + noteType = TapNoteType_Invalid; } - ColumnCueColumn(int c, bool m) + ColumnCueColumn(int c, TapNoteType n) { colNum = c; - isMine = m; + noteType = n; } }; diff --git a/src/Steps.cpp b/src/Steps.cpp index 945b8b7dae..5bb1eeaeb3 100644 --- a/src/Steps.cpp +++ b/src/Steps.cpp @@ -844,8 +844,8 @@ public: lua_pushinteger(L, cues[i].columns[c].colNum); lua_settable(L, -3); - lua_pushstring(L, "isMine"); - lua_pushboolean(L, cues[i].columns[c].isMine); + lua_pushstring(L, "noteType"); + lua_pushinteger(L, cues[i].columns[c].noteType); lua_settable(L, -3); lua_rawseti(L, -2, c + 1);