columnCount -> columnCount_

Resolves MSVC compiler warning C4458 by renaming the class variables to columnCount_.
https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-4-c4458
This commit is contained in:
sukibaby
2025-04-29 21:40:54 -07:00
committed by teejusb
parent 305a24196a
commit ab6d2ff3d0
2 changed files with 10 additions and 10 deletions
+9 -9
View File
@@ -9,7 +9,7 @@ using namespace StepParity;
bool StepParityGenerator::analyzeNoteData(const NoteData &in) bool StepParityGenerator::analyzeNoteData(const NoteData &in)
{ {
columnCount = in.GetNumTracks(); columnCount_ = in.GetNumTracks();
CreateRows(in); CreateRows(in);
@@ -42,7 +42,7 @@ void StepParityGenerator::buildStateGraph()
{ {
// The first node of the graph is beginningState, which represents the time before // The first node of the graph is beginningState, which represents the time before
// the first note (and so it's roIndex is considered -1) // the first note (and so it's roIndex is considered -1)
beginningState = new State(columnCount); beginningState = new State(columnCount_);
startNode = addNode(beginningState, rows[0].second - 1, -1); startNode = addNode(beginningState, rows[0].second - 1, -1);
std::queue<StepParityNode *> previousNodes; std::queue<StepParityNode *> previousNodes;
@@ -78,7 +78,7 @@ void StepParityGenerator::buildStateGraph()
// at this point, previousStates holds all of the states for the very last row, // at this point, previousStates holds all of the states for the very last row,
// which just get connected to the endState // which just get connected to the endState
endingState = new State(columnCount); endingState = new State(columnCount_);
endNode = addNode(endingState, rows[rows.size() - 1].second + 1, rows.size()); endNode = addNode(endingState, rows[rows.size() - 1].second + 1, rows.size());
while(!previousNodes.empty()) while(!previousNodes.empty())
@@ -540,12 +540,12 @@ void StepParityGenerator::CreateRows(const NoteData &in)
counter.lastColumnBeat = note.beat; counter.lastColumnBeat = note.beat;
counter.nextMines.assign(counter.mines.begin(), counter.mines.end()); counter.nextMines.assign(counter.mines.begin(), counter.mines.end());
counter.nextFakeMines.assign(counter.fakeMines.begin(), counter.fakeMines.end()); counter.nextFakeMines.assign(counter.fakeMines.begin(), counter.fakeMines.end());
counter.notes = std::vector<IntermediateNoteData>(columnCount); counter.notes = std::vector<IntermediateNoteData>(columnCount_);
counter.mines = std::vector<float>(columnCount); counter.mines = std::vector<float>(columnCount_);
counter.fakeMines = std::vector<float>(columnCount); counter.fakeMines = std::vector<float>(columnCount_);
// Reset any now-inactive holds to empty values. // Reset any now-inactive holds to empty values.
for (int c = 0; c < columnCount; c++) for (int c = 0; c < columnCount_; c++)
{ {
if (counter.activeHolds[c].type == TapNoteType_Empty || note.beat > counter.activeHolds[c].beat + counter.activeHolds[c].hold_length) if (counter.activeHolds[c].type == TapNoteType_Empty || note.beat > counter.activeHolds[c].beat + counter.activeHolds[c].hold_length)
{ {
@@ -573,14 +573,14 @@ void StepParityGenerator::AddRow(RowCounter &counter)
Row StepParityGenerator::CreateRow(RowCounter &counter) Row StepParityGenerator::CreateRow(RowCounter &counter)
{ {
Row row = Row(columnCount); Row row = Row(columnCount_);
row.notes.assign(counter.notes.begin(), counter.notes.end()); row.notes.assign(counter.notes.begin(), counter.notes.end());
row.mines.assign(counter.nextMines.begin(), counter.nextMines.end()); row.mines.assign(counter.nextMines.begin(), counter.nextMines.end());
row.fakeMines.assign(counter.nextFakeMines.begin(), counter.nextFakeMines.end()); row.fakeMines.assign(counter.nextFakeMines.begin(), counter.nextFakeMines.end());
row.second = counter.lastColumnSecond; row.second = counter.lastColumnSecond;
row.beat = counter.lastColumnBeat; row.beat = counter.lastColumnBeat;
for (int c = 0; c < columnCount; c++) for (int c = 0; c < columnCount_; c++)
{ {
// save any active holds // save any active holds
if (counter.activeHolds[c].type == TapNoteType_Empty || counter.activeHolds[c].second >= counter.lastColumnSecond) if (counter.activeHolds[c].type == TapNoteType_Empty || counter.activeHolds[c].second >= counter.lastColumnSecond)
+1 -1
View File
@@ -47,7 +47,7 @@ namespace StepParity {
std::vector<StepParity::StepParityNode*> nodes; std::vector<StepParity::StepParityNode*> nodes;
std::vector<Row> rows; std::vector<Row> rows;
std::vector<int> nodes_for_rows; std::vector<int> nodes_for_rows;
int columnCount; int columnCount_;
StepParityGenerator(const StageLayout & l) : layout(l) { StepParityGenerator(const StageLayout & l) : layout(l) {