From d90304c1505d3a4688936325076685661a08db4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?DOTTEL=20Ga=C3=ABl?= Date: Tue, 3 Oct 2023 11:05:04 +0200 Subject: [PATCH] fix enum lock --- HexGenerator/Source/Options/BooleanCheckBox.cpp | 2 +- HexGenerator/Source/Options/FloatingPoint.cpp | 2 +- HexGenerator/Source/Options/SimpleInteger.cpp | 2 +- HexGenerator/Source/Options/TimeExpression.cpp | 2 +- .../Pokemon/Options/Pokemon_StatsResetFilter (disabled).cpp | 4 ++-- .../Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/HexGenerator/Source/Options/BooleanCheckBox.cpp b/HexGenerator/Source/Options/BooleanCheckBox.cpp index ca462c2af..20c46147a 100644 --- a/HexGenerator/Source/Options/BooleanCheckBox.cpp +++ b/HexGenerator/Source/Options/BooleanCheckBox.cpp @@ -33,7 +33,7 @@ BooleanCheckBox::BooleanCheckBox(const JsonObject& obj) : SingleStatementOption(obj) , m_option( SingleStatementOption::m_label, - LockWhileRunning::LOCKED, + LockMode::LOCK_WHILE_RUNNING, obj.get_value_throw(JSON_DEFAULT).get_boolean_throw() ) { diff --git a/HexGenerator/Source/Options/FloatingPoint.cpp b/HexGenerator/Source/Options/FloatingPoint.cpp index 0f492ff03..5aa89e2e6 100644 --- a/HexGenerator/Source/Options/FloatingPoint.cpp +++ b/HexGenerator/Source/Options/FloatingPoint.cpp @@ -37,7 +37,7 @@ FloatingPoint::FloatingPoint(const JsonObject& obj) : SingleStatementOption(obj) , m_option( SingleStatementOption::m_label, - LockWhileRunning::LOCKED, + LockMode::LOCK_WHILE_RUNNING, obj.get_double_throw(JSON_DEFAULT), obj.get_double_throw(JSON_MIN_VALUE), obj.get_double_throw(JSON_MAX_VALUE) diff --git a/HexGenerator/Source/Options/SimpleInteger.cpp b/HexGenerator/Source/Options/SimpleInteger.cpp index 8ccc8dd36..6ea5a106b 100644 --- a/HexGenerator/Source/Options/SimpleInteger.cpp +++ b/HexGenerator/Source/Options/SimpleInteger.cpp @@ -33,7 +33,7 @@ SimpleInteger::SimpleInteger(const JsonObject& obj) : SingleStatementOption(obj) , m_option( SingleStatementOption::m_label, - LockWhileRunning::LOCKED, + LockMode::LOCK_WHILE_RUNNING, obj.get_integer_throw(JSON_DEFAULT), obj.get_integer_throw(JSON_MIN_VALUE), obj.get_integer_throw(JSON_MAX_VALUE) diff --git a/HexGenerator/Source/Options/TimeExpression.cpp b/HexGenerator/Source/Options/TimeExpression.cpp index a7c602854..f60e774bc 100644 --- a/HexGenerator/Source/Options/TimeExpression.cpp +++ b/HexGenerator/Source/Options/TimeExpression.cpp @@ -40,7 +40,7 @@ TimeExpression::TimeExpression(const JsonObject& obj) : SingleStatementOption(obj) , m_option( SingleStatementOption::m_label, - LockWhileRunning::LOCKED, + LockMode::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, obj.get_integer_throw(JSON_MIN_VALUE), obj.get_integer_throw(JSON_MAX_VALUE), diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).cpp index 791da7c03..25a4e5261 100644 --- a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).cpp +++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).cpp @@ -13,7 +13,7 @@ namespace Pokemon{ StatsResetFilterRow::StatsResetFilterRow() : action(StatsHuntAction::StopProgram) - , nature(NatureCheckerFilter_Database(), LockWhileRunning::LOCKED, NatureCheckerFilter::Any) + , nature(NatureCheckerFilter_Database(), LockMode::LOCK_WHILE_RUNNING, NatureCheckerFilter::Any) , iv_hp(IvJudgeFilter::Anything) , iv_atk(IvJudgeFilter::Anything) , iv_def(IvJudgeFilter::Anything) @@ -47,7 +47,7 @@ StatsResetFilterTable::StatsResetFilterTable() "Actions Table:
" "If the caught Pokemon matches one of these filters, the program will stop. " "IV checking requires that your right panel be set to the IV Judge and that you have selected the correct game language above.", - LockWhileRunning::LOCKED, + LockMode::LOCK_WHILE_RUNNING, make_defaults() ) {} diff --git a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp index 1fbafcbc9..34f678e4a 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp @@ -67,7 +67,7 @@ PlatformResetSettings::PlatformResetSettings() , RESET_DURATION_MINUTES( "Reset Duration (minutes):
If you are resetting, reset the game every " "this many minutes.", - LockWhileRunning::UNLOCK_WHILE_RUNNING, + LockMode::UNLOCK_WHILE_RUNNING, 180 ) #endif