Return the noteType for columnCues instead of isMine.

This commit is contained in:
Michael Votaw
2024-08-11 09:43:54 -07:00
committed by teejusb
parent 5db1a56d48
commit f96ee75ccc
3 changed files with 14 additions and 12 deletions
+6 -6
View File
@@ -26,13 +26,13 @@ void ColumnCue::CalculateColumnCues(const NoteData &in, std::vector<ColumnCue> &
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;
+6 -4
View File
@@ -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;
}
};
+2 -2
View File
@@ -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);