From c0e74276e2357eb0e20f5f67a39eb50afb5794ce Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Thu, 21 May 2020 22:15:12 -0400 Subject: [PATCH] calc test compiler flag enable thing --- src/Etterna/Globals/MinaCalc.h | 1 + src/Etterna/Screen/Others/ScreenSelectMusic.cpp | 3 +++ src/Etterna/Singletons/SongManager.cpp | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/src/Etterna/Globals/MinaCalc.h b/src/Etterna/Globals/MinaCalc.h index 97e4217690..158d31eade 100644 --- a/src/Etterna/Globals/MinaCalc.h +++ b/src/Etterna/Globals/MinaCalc.h @@ -12,6 +12,7 @@ #define MINACALC_API #endif //#define USING_NEW_CALC +//#define USING_CALCTESTS typedef std::vector> MinaSD; typedef std::vector> Finger; typedef std::vector ProcessedFingers; diff --git a/src/Etterna/Screen/Others/ScreenSelectMusic.cpp b/src/Etterna/Screen/Others/ScreenSelectMusic.cpp index 31bec0c021..d7f88e783c 100644 --- a/src/Etterna/Screen/Others/ScreenSelectMusic.cpp +++ b/src/Etterna/Screen/Others/ScreenSelectMusic.cpp @@ -565,6 +565,9 @@ ScreenSelectMusic::Input(const InputEventPlus& input) input.type == IET_FIRST_PRESS && GAMESTATE->m_pCurSteps != nullptr) { +#ifndef USING_CALCTESTS + return false; +#endif auto ck = GAMESTATE->m_pCurSteps->GetChartKey(); Skillset foundSS = Skillset_Invalid; for (auto ss : SONGMAN->testChartList) { diff --git a/src/Etterna/Singletons/SongManager.cpp b/src/Etterna/Singletons/SongManager.cpp index 6dad1c311b..0eb05e46ca 100644 --- a/src/Etterna/Singletons/SongManager.cpp +++ b/src/Etterna/Singletons/SongManager.cpp @@ -1670,6 +1670,9 @@ CalcTestList::CreateNode() const void SongManager::LoadCalcTestNode() const { +#ifndef USING_CALCTESTS + return; +#endif string fn = "Save/" + calctest_XML; int iError; unique_ptr pFile(FILEMAN->Open(fn, RageFile::READ, iError)); @@ -1742,6 +1745,9 @@ SongManager::SaveCalcTestCreateNode() const void SongManager::SaveCalcTestXmlToDir() const { +#ifndef USING_CALCTESTS + return; +#endif string fn = "Save/" + calctest_XML; // calc test hardcode stuff cuz ASDKLFJASKDJLFHASHDFJ unique_ptr xml(SaveCalcTestCreateNode());