From bc6bb899aa8aebb4e78c202d2d31a7aed86549a9 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Mon, 25 May 2020 22:45:37 -0400 Subject: [PATCH] pickled frog skin --- src/Etterna/Globals/MinaCalc.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Etterna/Globals/MinaCalc.cpp b/src/Etterna/Globals/MinaCalc.cpp index db5d63794b..0aa90dd843 100644 --- a/src/Etterna/Globals/MinaCalc.cpp +++ b/src/Etterna/Globals/MinaCalc.cpp @@ -1195,8 +1195,12 @@ RM_Sequencing::reset() is_bursting = false; had_burst = false; + // reset?? don't reset???? + last_anchor_time = s_init; + last_off_time = s_init; total_taps = 0; ran_taps = 0; + anchor_len = 0; off_taps_same = 0; oht_taps = 0; @@ -1352,7 +1356,7 @@ RM_Sequencing::handle_oht_progression(const cc_type& cc) inline void RM_Sequencing::operator()(const metanoteinfo& mni) { - total_taps += column_count(mni.count); + total_taps += mni.count; switch (mni.cc) { case cc_left_right: @@ -1701,6 +1705,7 @@ gen_metanoteinfo(const vector>& itv_rows, auto& itv = itv_rows[i]; for (auto& row : itv) { metanoteinfo mni; + mni.last_was_offhand_tap = was_last_offhand_tap; mni.set_col_and_cc_types(NoteInfo[row].notes & t1, NoteInfo[row].notes & t2, last_col); @@ -1720,9 +1725,9 @@ gen_metanoteinfo(const vector>& itv_rows, if (rms[test].anchor_len > rm_to_use_for_mods.anchor_len) rm_to_use_for_mods = rms[test]; + was_last_offhand_tap = offhand_tap; } - mni.last_was_offhand_tap = offhand_tap; // we don't want to set lasttime or lastcol for empty rows if (mni.col == col_empty) continue;