Skip to content

Commit

Permalink
don't try set ccon when rescoring anymore, only off (wife3 stops abuse)
Browse files Browse the repository at this point in the history
also compiler warn fixes for solo calc
  • Loading branch information
MinaciousGrace committed May 18, 2020
1 parent e9c4e12 commit 3cf42c3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/Etterna/Globals/SoloCalc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
using namespace ::std;

const float finalscaler = 2.564f * 1.05f * 1.1f * 1.10f * 1.10f *
1.025; // multiplier to standardize baselines
1.025f; // multiplier to standardize baselines

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

if (i.notes & column) {
Expand Down
4 changes: 1 addition & 3 deletions src/Etterna/Singletons/ScoreManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -528,12 +528,10 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld, const string& profileID)
totalscorenotes += hs->GetTapNoteScore(TNS_W5);
totalscorenotes += hs->GetTapNoteScore(TNS_Miss);

if (totalstepsnotes - totalscorenotes == 0)
if (totalstepsnotes == totalscorenotes)
hs->SetChordCohesion(1); // the set function isn't inverted
// but the get function is, this
// sets bnochordcohesion to 1
else
hs->SetChordCohesion(0);
}
};
auto onUpdate = [ld](int progress) {
Expand Down

0 comments on commit 3cf42c3

Please sign in to comment.