diff --git a/src/ScreenNetEvaluation.cpp b/src/ScreenNetEvaluation.cpp index 0962f9ca4d..5139ba94ba 100644 --- a/src/ScreenNetEvaluation.cpp +++ b/src/ScreenNetEvaluation.cpp @@ -39,45 +39,6 @@ ScreenNetEvaluation::Init() NSMAN->OnEval(); } -bool -ScreenNetEvaluation::MenuLeft(const InputEventPlus& input) -{ - return MenuUp(input); -} - -bool -ScreenNetEvaluation::MenuUp(const InputEventPlus& input) -{ - if (m_iActivePlayers == 0 || !m_bHasStats) - return false; - - COMMAND(m_textUsers[m_iCurrentPlayer], "DeSel"); - m_iCurrentPlayer = - (m_iCurrentPlayer + m_iActivePlayers - 1) % m_iActivePlayers; - COMMAND(m_textUsers[m_iCurrentPlayer], "Sel"); - UpdateStats(); - return true; -} - -bool -ScreenNetEvaluation::MenuRight(const InputEventPlus& input) -{ - return MenuDown(input); -} - -bool -ScreenNetEvaluation::MenuDown(const InputEventPlus& input) -{ - if (m_iActivePlayers == 0 || !m_bHasStats) - return false; - - COMMAND(m_textUsers[m_iCurrentPlayer], "DeSel"); - m_iCurrentPlayer = (m_iCurrentPlayer + 1) % m_iActivePlayers; - COMMAND(m_textUsers[m_iCurrentPlayer], "Sel"); - UpdateStats(); - return true; -} - bool ScreenNetEvaluation::Input(const InputEventPlus& input) { @@ -116,19 +77,8 @@ ScreenNetEvaluation::HandleScreenMessage(const ScreenMessage SM) NSMAN->m_EvalPlayerData[i].name < 0) break; - if (size_t(i) >= m_textUsers.size()) - break; - - m_textUsers[i].SetText( - NSMAN->m_EvalPlayerData[i].nameStr.empty() - ? NSMAN->m_PlayerNames[NSMAN->m_EvalPlayerData[i].name] - : NSMAN->m_EvalPlayerData[i].nameStr); - if (NSMAN->m_EvalPlayerData[m_iCurrentPlayer].hs.GetWifeGrade() < Grade_Tier03) - m_textUsers[i].PlayCommand("Tier02OrBetter"); - - ON_COMMAND(m_textUsers[i]); LOG->Trace("SMNETCheckpoint%d", i); } return; // No need to let ScreenEvaluation get a hold of this. @@ -142,9 +92,6 @@ ScreenNetEvaluation::HandleScreenMessage(const ScreenMessage SM) void ScreenNetEvaluation::TweenOffScreen() { - for (int i = 0; i < m_iActivePlayers; ++i) - OFF_COMMAND(m_textUsers[i]); - OFF_COMMAND(m_rectUsersBG); ScreenEvaluation::TweenOffScreen(); } @@ -166,13 +113,6 @@ ScreenNetEvaluation::UpdateStats() m_textScore[m_pActivePlayer].SetTargetNumber( static_cast(NSMAN->m_EvalPlayerData[m_iCurrentPlayer].score)); - // Values greater than 6 will cause a crash - if (NSMAN->m_EvalPlayerData[m_iCurrentPlayer].difficulty < 6) { - m_DifficultyIcon[m_pActivePlayer].SetPlayer(m_pActivePlayer); - m_DifficultyIcon[m_pActivePlayer].SetFromDifficulty( - NSMAN->m_EvalPlayerData[m_iCurrentPlayer].difficulty); - } - for (int j = 0; j < NETNUMTAPSCORES; ++j) { // The name will be blank if ScreenEvaluation determined the line // should not be shown. diff --git a/src/ScreenNetEvaluation.h b/src/ScreenNetEvaluation.h index a20d5766da..fcefaad0a3 100644 --- a/src/ScreenNetEvaluation.h +++ b/src/ScreenNetEvaluation.h @@ -19,21 +19,9 @@ class ScreenNetEvaluation : public ScreenEvaluation int m_iCurrentPlayer; void UpdateStats(); protected: - bool MenuLeft(const InputEventPlus& input) override; - bool MenuUp(const InputEventPlus& input) override; - bool MenuRight(const InputEventPlus& input) override; - bool MenuDown(const InputEventPlus& input) override; void HandleScreenMessage(ScreenMessage SM) override; void TweenOffScreen() override; private: - // todo: Make this an AutoActor -aj - Quad m_rectUsersBG; - - // todo: Make this a StepsDisplay -aj - DifficultyIcon m_DifficultyIcon[NUM_PLAYERS]; - // StepsDisplay m_StepsDisplays[NUM_PLAYERS]; - - vector m_textUsers; int m_iActivePlayers; PlayerNumber m_pActivePlayer;