Return the noteType for columnCues instead of isMine.
This commit is contained in:
+6
-6
@@ -26,13 +26,13 @@ void ColumnCue::CalculateColumnCues(const NoteData &in, std::vector<ColumnCue> &
|
|||||||
curr_row = curr_note.Row();
|
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));
|
currentCue.columns.push_back(ColumnCueColumn(curr_note.Track() + 1, curr_note->type));
|
||||||
}
|
|
||||||
else if(curr_note->type == TapNoteType_Mine)
|
|
||||||
{
|
|
||||||
currentCue.columns.push_back(ColumnCueColumn(curr_note.Track() + 1, true));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
++curr_note;
|
++curr_note;
|
||||||
|
|||||||
+6
-4
@@ -2,6 +2,8 @@
|
|||||||
#define COLUMN_CUES_H
|
#define COLUMN_CUES_H
|
||||||
|
|
||||||
#include "GameConstantsAndTypes.h"
|
#include "GameConstantsAndTypes.h"
|
||||||
|
#include "NoteTypes.h"
|
||||||
|
|
||||||
class NoteData;
|
class NoteData;
|
||||||
|
|
||||||
/* ColumnCues are used to indicate to the player which column the next note will occur
|
/* ColumnCues are used to indicate to the player which column the next note will occur
|
||||||
@@ -11,16 +13,16 @@ class NoteData;
|
|||||||
struct ColumnCueColumn
|
struct ColumnCueColumn
|
||||||
{
|
{
|
||||||
int colNum;
|
int colNum;
|
||||||
bool isMine;
|
TapNoteType noteType;
|
||||||
ColumnCueColumn()
|
ColumnCueColumn()
|
||||||
{
|
{
|
||||||
colNum = 0;
|
colNum = 0;
|
||||||
isMine = false;
|
noteType = TapNoteType_Invalid;
|
||||||
}
|
}
|
||||||
ColumnCueColumn(int c, bool m)
|
ColumnCueColumn(int c, TapNoteType n)
|
||||||
{
|
{
|
||||||
colNum = c;
|
colNum = c;
|
||||||
isMine = m;
|
noteType = n;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -844,8 +844,8 @@ public:
|
|||||||
lua_pushinteger(L, cues[i].columns[c].colNum);
|
lua_pushinteger(L, cues[i].columns[c].colNum);
|
||||||
lua_settable(L, -3);
|
lua_settable(L, -3);
|
||||||
|
|
||||||
lua_pushstring(L, "isMine");
|
lua_pushstring(L, "noteType");
|
||||||
lua_pushboolean(L, cues[i].columns[c].isMine);
|
lua_pushinteger(L, cues[i].columns[c].noteType);
|
||||||
lua_settable(L, -3);
|
lua_settable(L, -3);
|
||||||
|
|
||||||
lua_rawseti(L, -2, c + 1);
|
lua_rawseti(L, -2, c + 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user