Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix enum lock #373

Merged
merged 1 commit into from
Oct 3, 2023
Merged

fix enum lock #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion HexGenerator/Source/Options/BooleanCheckBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
)
{
Expand Down
2 changes: 1 addition & 1 deletion HexGenerator/Source/Options/FloatingPoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion HexGenerator/Source/Options/SimpleInteger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion HexGenerator/Source/Options/TimeExpression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -47,7 +47,7 @@ StatsResetFilterTable::StatsResetFilterTable()
"<b>Actions Table:</b><br>"
"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()
)
{}
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ PlatformResetSettings::PlatformResetSettings()
, RESET_DURATION_MINUTES(
"<b>Reset Duration (minutes):</b><br>If you are resetting, reset the game every "
"this many minutes.",
LockWhileRunning::UNLOCK_WHILE_RUNNING,
LockMode::UNLOCK_WHILE_RUNNING,
180
)
#endif
Expand Down