Skip to content

Commit c67e81c

Browse files
committed
Merge gbracket pmod nan fix #1403
2 parents 1d67714 + cf313f9 commit c67e81c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/Etterna/MinaCalc/Dependent/HD_PatternMods/GenericBracketing.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ struct GBracketingMod
7878
}
7979

8080
// definitely no brackets, decay
81-
if (mitvghi.taps_bracketing == 0) {
81+
if (mitvghi.taps_bracketing == 0 || mitvghi.total_taps == static_cast<int>(prop_buffer)) {
8282
decay_mod();
8383
return pmod;
8484
}
@@ -87,8 +87,9 @@ struct GBracketingMod
8787
bracket_taps = static_cast<float>(mitvghi.taps_bracketing);
8888

8989
total_prop =
90-
total_prop_base + ((bracket_taps + prop_buffer) /
91-
(t_taps - prop_buffer) * total_prop_scaler);
90+
total_prop_base + ((bracket_taps + prop_buffer) /
91+
(t_taps - prop_buffer) * total_prop_scaler);
92+
9293
total_prop =
9394
std::clamp(fastsqrt(total_prop), total_prop_min, total_prop_max);
9495

src/Etterna/MinaCalc/MinaCalc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ MinaSDCalcDebug(
957957
#endif
958958
}
959959

960-
int mina_calc_version = 521;
960+
int mina_calc_version = 522;
961961
auto
962962
GetCalcVersion() -> int
963963
{

0 commit comments

Comments
 (0)