Skip to content

Commit

Permalink
move 0 check for ssr to after rescoring
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed May 19, 2020
1 parent c9fd096 commit d2b60ba
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions src/Etterna/Singletons/ScoreManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -462,13 +462,6 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld, const string& profileID)
float ssrpercent = hs->GetSSRNormPercent();
float musicrate = hs->GetMusicRate();


// don't waste time on <= 0%s
if (ssrpercent <= 0.f) {
hs->ResetSkillsets();
continue;
}

// ghasgh we need to decompress to get maxpoints
TimingData* td = steps->GetTimingData();
NoteData nd;
Expand All @@ -481,13 +474,15 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld, const string& profileID)
hs->RescoreToWife3(static_cast<float>(maxpoints));
}

if (!steps->IsRecalcValid()) {
// don't waste time on <= 0%s
if (ssrpercent <= 0.f || !steps->IsRecalcValid()) {
hs->ResetSkillsets();
continue;
}

// if this is not a rescore and has already been run on the current calc vers, skip
// if it is a rescore, rerun it even if the calc version is the same
// if this is not a rescore and has already been run on the
// current calc vers, skip if it is a rescore, rerun it even if
// the calc version is the same
if (!remarried && hs->GetSSRCalcVersion() == GetCalcVersion())
continue;

Expand Down Expand Up @@ -788,7 +783,8 @@ ScoresAtRate::LoadFromNode(const XNode* node,
bool oldcalc = scores[sk].GetSSRCalcVersion() != GetCalcVersion();
// don't include cc check here, we want cc scores to filter into the
// recalc, just not the rescore
bool getremarried = scores[sk].GetWifeVersion() != 3 && scores[sk].HasReplayData();
bool getremarried =
scores[sk].GetWifeVersion() != 3 && scores[sk].HasReplayData();

// technically we don't need to have charts loaded to rescore to wife3,
// however trying to do this might be quite a bit of work (it would
Expand Down

0 comments on commit d2b60ba

Please sign in to comment.