tidy

Author: MinaciousGrace

src/Etterna/Globals/MinaCalc.cpp

@@ -678,7 +678,7 @@ Calc::InitializeHands(const vector<NoteInfo>& NoteInfo,
 
 	ulbu_that_which_consumes_all.heres_my_diffs(left_hand.soap,
 												right_hand.soap);
-	
+
 	ulbu_that_which_consumes_all(
 	  nervIntervals, music_rate, left_hand.doot, right_hand.doot);
 
@@ -726,8 +726,6 @@ Hand::InitBaseDiff(Finger& f1, Finger& f2)
 	}
 
 	for (int i = 0; i < f1.size(); i++) {
-		// scaler for things with higher things
-		static const float higher_thing_scaler = 1.175F;
 		float nps = 1.6F * static_cast<float>(f1[i].size() + f2[i].size());
 		soap[NPSBase][i] = finalscaler * nps;
 	}
@@ -747,7 +745,6 @@ Calc::Chisel(float player_skill,
 
 	float gotpoints = 0.F;
 	float reqpoints = static_cast<float>(MaxPoints) * score_goal;
-	float max_points_lost = static_cast<float>(MaxPoints) - reqpoints;
 	float jloss = 0.F;
 	for (int iter = 1; iter <= 8; iter++) {
 		do {
@@ -856,7 +853,7 @@ Hand::InitAdjDiff()
 
 		// stam, nothing, don't handle here
 		{},
-
+
 		// jackspeed
 		{
 		  OHTrill,

src/Etterna/Globals/MinaCalc/Agnostic/HA_Sequencers/FlamSequencing.h

@@ -67,8 +67,9 @@ struct flam
 
 	inline void grow(const float& ms_now, const unsigned& notes)
 	{
-		if (size == max_flam_jammies)
+		if (size == max_flam_jammies) {
 			return;
+		}
 
 		unsigned_unseen |= notes;
 		ms.at(size - 1) = ms_now;

src/Etterna/Globals/MinaCalc/Agnostic/HA_Sequencers/ThingSequencing.h

@@ -299,7 +299,7 @@ struct TT_Sequencing
 	inline void reset()
 	{
 		slip_counter = 0;
-		mod_parts.fill(1.f);
+		mod_parts.fill(1.F);
 	}
 
 	inline auto construct_mod_part() -> float { return scaler; }

src/Etterna/Globals/MinaCalc/Dependent/HD_PatternMods/OHJ.h

@@ -94,15 +94,6 @@ struct OHJumpModGuyThing
 		prop_component = fastsqrt(prop_component);
 	}
 
-	inline void set_debug_output(vector<float> doot[], const int& i)
-	{
-		doot[OHJSeqComp][i] = max_seq_component;
-		doot[OHJPropComp][i] = prop_component;
-		doot[OHJBaseProp][i] = base_seq_prop;
-		doot[OHJMaxSeq][i] = floatymcfloatface;
-		doot[OHJCCTaps][i] = static_cast<float>(cc_taps);
-	}
-
 	inline void set_pmod(const metaItvHandInfo& mitvhi)
 	{
 		const auto& itvhi = mitvhi._itvhi;

src/Etterna/Globals/MinaCalc/Dependent/HD_PatternMods/Roll.h

@@ -52,7 +52,7 @@ struct RollMod
 #pragma endregion params and param map
 
 	int window = 0;
-	Roll_Sequencer _roll;
+	Roll_Sequencer _roll{};
 	CalcMovingWindow<float> _mw_pmod;
 
 	float moving_cv = cv_reset;
@@ -99,7 +99,7 @@ struct RollMod
 
 		interval_end();
 		_mw_pmod(pmod);
-		return 1.f;
+		return neutral;
 		//_mw_pmod.get_mean_of_window(window);
 	}
 

src/Etterna/Globals/MinaCalc/Dependent/HD_PatternMods/RunningMan.h

@@ -191,31 +191,13 @@ struct RunningManMod
 	inline void advance_sequencing(const col_type& ct,
 								   const base_type& bt,
 								   const meta_type& mt,
-								   const float& row_time,
-								   const int& offhand_taps,
 								   const AnchorSequencer& as)
 	{
 		for (auto& c : ct_loop_no_jumps) {
 			rms.at(c)(ct, bt, mt, as.anch[c]);
 		}
 	}
 
-	inline void set_dbg(vector<float> doot[], const int& i)
-	{
-		if (debug_lmao) {
-			// doot[RanLen][i] = 1.F;
-			// doot[RanAnchLen][i] = (static_cast<float>(rm._len) / 30.F) +
-			// 0.5F; doot[RanAnchLenMod][i] = anchor_len_comp; doot[RanOHT][i] =
-			// static_cast<float>(rm.oht_taps); doot[RanOffS][i] =
-			// static_cast<float>(rm.off_taps_sh); doot[RanJack][i] =
-			// static_cast<float>(rm.jack_taps); doot[RanPropAll][i] =
-			// total_prop; doot[RanPropOff][i] = off_tap_prop;
-			// doot[RanPropOffS][i] = off_tap_same_prop;
-			// doot[RanPropOHT][i] = oht_bonus;
-			// doot[RanPropJack][i] = jack_bonus;
-		}
-	}
-
 	inline auto get_highest_anchor_difficulty() -> float
 	{
 		return max(rms.at(col_left).get_difficulty(),

src/Etterna/Globals/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h

@@ -134,10 +134,14 @@ struct Anchor_Sequencing
 
 	inline auto get_difficulty() -> float
 	{
-		if (_len <= 2)
+		if (_len <= 2) {
+
 			return ms_to_scaled_nps(_sc_ms + 90.F);
-		if (_len == 3)
+		}
+		if (_len == 3) {
+
 			return ms_to_scaled_nps(_sc_ms + 180.F);
+		}
 		float flool = ms_from(_last, _start);
 		float pule = (flool + 270.F) / static_cast<float>(_len - 1);
 		float drool = ms_to_scaled_nps(pule);
@@ -263,8 +267,10 @@ struct SequencerGeneral
 	inline void set_sc_ms(const col_type& ct)
 	{
 		// single notes are simple
-		if (ct == col_left || ct == col_right)
+		if (ct == col_left || ct == col_right) {
+
 			_mw_sc_ms.at(ct)(_as.anch.at(ct)._sc_ms);
+		}
 
 		// oh jumps mean we do both, we will allow whatever is querying for the
 		// value to choose which column value they want (lower by default)
@@ -323,8 +329,10 @@ struct SequencerGeneral
 
 	inline auto get_sc_ms_now(const col_type& ct, bool lower = true) -> float
 	{
-		if (ct == col_init)
+		if (ct == col_init) {
+
 			return ms_init;
+		}
 
 		// if ohjump, grab the smaller value by default
 		if (ct == col_ohjump) {
@@ -366,7 +374,7 @@ struct SequencerGeneral
 		itv_row_counter = 0;
 	}
 
-	std::array<float, 6> _cv_check = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f };
+	std::array<float, 6> _cv_check = { 0.F, 0.F, 0.F, 0.F, 0.F, 0.F };
 	CalcMovingWindow<float> _cv_check2;
 
 	[[nodiscard]] inline auto cccccc_check() -> float
@@ -386,7 +394,7 @@ struct SequencerGeneral
 
 	[[nodiscard]] inline auto get_cv_mean(const int& window) -> float
 	{
-		float o = 0.f;
+		float o = 0.F;
 
 		int i = max_moving_window_size;
 		while (i > max_moving_window_size - window) {

src/Etterna/Globals/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h

@@ -265,21 +265,19 @@ struct RM_Sequencer
 	inline auto off_len_exceeds_max() -> bool
 	{
 		// haven't exceeded anything
-		if (_rm.off_len <= max_off_spacing)
+		if (_rm.off_len <= max_off_spacing) {
 			return false;
+		}
 
-		if (had_burst) {
-			// already had a burst and exceeding normal limit
-			return true;
-		} else if (_rm.off_len > max_burst_len) {
-			// exceeded the burst limit
+		// already had a burst and exceeding normal limit or exceeded the burst
+		// limit
+		if (had_burst || _rm.off_len > max_burst_len) {
 			return true;
-		} else {
-			// have exceeded the normal limit but not had a burst yet, set
-			// bursting to true and return false
-			is_bursting = true;
-			return false;
 		}
+		// have exceeded the normal limit but not had a burst yet, set
+		// bursting to true and return false
+		is_bursting = true;
+		return false;
 	}
 
 	inline auto jack_len_exceeds_max() -> bool
@@ -392,8 +390,10 @@ struct RM_Sequencer
 			// metatype won't be set until it finds 1212, but we want to
 			// explicitly track the number of off_anchor taps in the oht, so
 			// boost by 1 when we see meta_oht and oht_len == 0
-			if (_rm.oht_len == 0)
+			if (_rm.oht_len == 0) {
+
 				_rm.add_oht_tap();
+			}
 
 			_rm.add_oht_tap();
 			if (oht_len_exceeds_max()) {
@@ -452,8 +452,10 @@ struct RM_Sequencer
 		// in the anchoring block because technically jacks can either be on the
 		// anchor column or not, and i don't want to have to split logic again
 		// between anchor column jacks and off anchor jacks on the same hand
-		if (as._ct == _ct)
+		if (as._ct == _ct) {
+
 			last_anchor_time = as._last;
+		}
 
 		// determine what we should do
 		switch (bt) {
@@ -526,14 +528,15 @@ struct RM_Sequencer
 
 	inline auto get_difficulty() -> float
 	{
-		if (_status == rm_inactive || _rm._len < 3)
-			return 1.f;
+		if (_status == rm_inactive || _rm._len < 3) {
+			return 1.F;
+		}
 
 		float flool = ms_from(last_anchor_time, _start);
 
 		// may be unnecessary
 		float glunk =
-		  CalcClamp(static_cast<float>(_rm.off_taps_sh) / 3.f, 0.1f, 1.f);
+		  CalcClamp(static_cast<float>(_rm.off_taps_sh) / 3.F, 0.1F, 1.F);
 
 		float pule = (flool + 25.F) / static_cast<float>(_rm._len - 1);
 		float drool = ms_to_scaled_nps(pule);

src/Etterna/Globals/MinaCalc/Dependent/IntervalHandInfo.h

@@ -32,22 +32,18 @@ struct ItvHandInfo
 
 		// update interval mws for col taps
 		for (auto& ct : ct_loop) {
-			_mw_col_taps[ct](_col_taps[ct]);
+			_mw_col_taps.at(ct)(_col_taps.at(ct));
 		}
 
 		// reset taps per col on this hand
 		_col_taps.fill(0);
-
-		// reset offhand taps
-		_offhand_taps = 0;
 	}
 
 	// zeroes out all values for everything, complete reset for when we swap
 	// hands maybe move to constructor and reconstruct when swapping hands??
 	inline void zero()
 	{
 		_col_taps.fill(0);
-		_offhand_taps = 0;
 
 		for (auto& mw : _mw_col_taps) {
 			mw.zero();
@@ -59,23 +55,23 @@ struct ItvHandInfo
 	[[nodiscard]] inline auto get_col_taps_nowi(const col_type& ct) const -> int
 	{
 		assert(ct < num_col_types);
-		return _mw_col_taps[ct].get_now();
+		return _mw_col_taps.at(ct).get_now();
 	}
 
 	// cast to float for divisioning and clean screen
 	[[nodiscard]] inline auto get_col_taps_nowf(const col_type& ct) const
 	  -> float
 	{
 		assert(ct < num_col_types);
-		return static_cast<float>(_mw_col_taps[ct].get_now());
+		return static_cast<float>(_mw_col_taps.at(ct).get_now());
 	}
 
 	[[nodiscard]] inline auto get_col_taps_windowi(const col_type& ct,
 												   const int& window) const
 	  -> int
 	{
 		assert(ct < num_col_types && window < max_moving_window_size);
-		return _mw_col_taps[ct].get_total_for_window(window);
+		return _mw_col_taps.at(ct).get_total_for_window(window);
 	}
 
 	// cast to float for divisioning and clean screen
@@ -85,7 +81,7 @@ struct ItvHandInfo
 	{
 		assert(ct < num_col_types && window < max_moving_window_size);
 		return static_cast<float>(
-		  _mw_col_taps[ct].get_total_for_window(window));
+		  _mw_col_taps.at(ct).get_total_for_window(window));
 	}
 
 	// col operations
@@ -165,11 +161,7 @@ struct ItvHandInfo
 		return static_cast<float>(_mw_hand_taps.get_total_for_window(window));
 	}
 
-	// uhh we uhh.. something sets this i think... this is not handled well
-  public:
-	int _offhand_taps = 0;
-
-  protected:
+  private:
 	std::array<int, num_col_types> _col_taps = { 0, 0, 0 };
 
 	// switch to keeping generic moving windows here, if any mod needs a moving