Skip to content

Commit 3cf42c3

Browse files
don't try set ccon when rescoring anymore, only off (wife3 stops abuse)
also compiler warn fixes for solo calc
1 parent e9c4e12 commit 3cf42c3

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/Etterna/Globals/SoloCalc.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using namespace ::std;
1313

1414
const float finalscaler = 2.564f * 1.05f * 1.1f * 1.10f * 1.10f *
15-
1.025; // multiplier to standardize baselines
15+
1.025f; // multiplier to standardize baselines
1616

1717
inline void
1818
Smooth(vector<float>& input, float neutral)
@@ -158,7 +158,7 @@ SoloCalc(const std::vector<NoteInfo>& notes, float music_rate, float goal)
158158
// why does this OOB calcing certain files if we don't include the
159159
// bounds check?
160160
while ((scaledtime > static_cast<float>(Interval + 1) * 0.5f) &&
161-
Interval < (AllIntervals[t].size() - 1))
161+
Interval < static_cast<int>(AllIntervals[t].size() - 1))
162162
++Interval;
163163

164164
if (i.notes & column) {

src/Etterna/Singletons/ScoreManager.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -528,12 +528,10 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld, const string& profileID)
528528
totalscorenotes += hs->GetTapNoteScore(TNS_W5);
529529
totalscorenotes += hs->GetTapNoteScore(TNS_Miss);
530530

531-
if (totalstepsnotes - totalscorenotes == 0)
531+
if (totalstepsnotes == totalscorenotes)
532532
hs->SetChordCohesion(1); // the set function isn't inverted
533533
// but the get function is, this
534534
// sets bnochordcohesion to 1
535-
else
536-
hs->SetChordCohesion(0);
537535
}
538536
};
539537
auto onUpdate = [ld](int progress) {

0 commit comments

Comments
 (0)