Skip to content

Commit

Permalink
begin the arduous process of being less bad in dealing with highscore…
Browse files Browse the repository at this point in the history
… m_impl or more bad for not removing it entirely you choose
  • Loading branch information
MinaciousGrace committed May 1, 2017
1 parent 868f31a commit e7602e0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 17 deletions.
25 changes: 9 additions & 16 deletions src/HighScore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,11 @@ void HighScore::LoadFromNode( const XNode* pNode )
}
}

void HighScore::LoadFromEttNode(const XNode* pNode)
{
m_Impl->LoadFromEttNode(pNode);
}

RString HighScore::GetDisplayName() const
{
if( GetName().empty() )
Expand Down Expand Up @@ -980,23 +985,11 @@ vector<int> HighScore::GetRescoreJudgeVector(int x) {
}

Grade HighScore::GetWifeGrade() {
if (GetGrade() == Grade_Failed)
return Grade_Failed;
return m_Impl->GetWifeGrade();
}

float wifescore = GetWifeScore();
if (wifescore >= 0.9998f)
return Grade_Tier01;
if (wifescore >= 0.9975f)
return Grade_Tier02;
if (wifescore >= 0.93f)
return Grade_Tier03;
if (wifescore >= 0.8f)
return Grade_Tier04;
if (wifescore >= 0.7f)
return Grade_Tier05;
if (wifescore >= 0.6f)
return Grade_Tier06;
return Grade_Tier07;
bool HighScore::WriteReplayData() {
return m_Impl->WriteReplayData();
}

// Ok I guess we can be more lenient and convert by midwindow values, but we still have to assume j4 - mina
Expand Down
3 changes: 2 additions & 1 deletion src/HighScore.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ struct HighScore
XNode* CreateNode() const;
XNode* CreateEttNode() const;
void LoadFromNode( const XNode* pNode );
void LoadEttNode(const XNode* pNode);
void LoadFromEttNode(const XNode* pNode);
bool WriteReplayData();

RString GetDisplayName() const;

Expand Down

0 comments on commit e7602e0

Please sign in to comment.