From 1868ce26e706cf442bfcb817b5f69d8b847c6f78 Mon Sep 17 00:00:00 2001 From: Mysticial Date: Thu, 28 Sep 2023 05:12:17 -0700 Subject: [PATCH] Fix Qt 6.5.3 build. Cleanup some error reports. Turn on error reports by default for beta. --- SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp | 2 +- SerialPrograms/Source/CommonFramework/Globals.cpp | 2 +- .../Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp | 4 ++-- .../Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp | 4 ++-- .../Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp | 2 +- .../Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp | 2 +- .../Programs/Sandwiches/PokemonSV_IngredientSession.cpp | 1 + 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp index bc07c1fd8..37a5239f9 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp @@ -103,7 +103,7 @@ GlobalSettings::GlobalSettings() "Send Error Reports:
" "Send error reports to the " + PROGRAM_NAME + " server to help them resolve issues and improve the program.", LockWhileRunning::LOCKED, - false + IS_BETA_VERSION ) , STATS_FILE( false, diff --git a/SerialPrograms/Source/CommonFramework/Globals.cpp b/SerialPrograms/Source/CommonFramework/Globals.cpp index d860f7915..de74b27bc 100644 --- a/SerialPrograms/Source/CommonFramework/Globals.cpp +++ b/SerialPrograms/Source/CommonFramework/Globals.cpp @@ -23,7 +23,7 @@ namespace PokemonAutomation{ const bool IS_BETA_VERSION = true; const int PROGRAM_VERSION_MAJOR = 0; const int PROGRAM_VERSION_MINOR = 41; -const int PROGRAM_VERSION_PATCH = 2; +const int PROGRAM_VERSION_PATCH = 3; const std::string PROGRAM_VERSION_BASE = "v" + std::to_string(PROGRAM_VERSION_MAJOR) + diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp index 2415d644f..28e801354 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp @@ -302,14 +302,14 @@ bool FlagNavigationAir::run_state(AsyncCommandSession& commands, WallClock times } if (m_dialog_detector.detected()){ throw OperationFailedException( - ErrorReport::SEND_ERROR_REPORT, m_console, + ErrorReport::NO_ERROR_REPORT, m_console, "Potential ambush by Miss Fortune sister.", true ); } if (m_find_flag_failed.load(std::memory_order_acquire)){ throw OperationFailedException( - ErrorReport::SEND_ERROR_REPORT, m_console, + ErrorReport::NO_ERROR_REPORT, m_console, "Unable to find flag.", true ); diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp index ff8e3c168..fe107d327 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp @@ -364,7 +364,7 @@ void goto_camp_from_overworld( if (current_time() - start > std::chrono::seconds(60)){ // dump_image(console.logger(), env.program_info(), "EscapeFromAttack", console.video().snapshot()); throw OperationFailedException( - ErrorReport::SEND_ERROR_REPORT, console, + ErrorReport::NO_ERROR_REPORT, console, "Unable to escape from being attacked.", true ); @@ -454,7 +454,7 @@ void goto_any_camp_from_overworld( if (current_time() - start > std::chrono::seconds(60)){ // dump_image(console.logger(), env.program_info(), "EscapeFromAttack", console.video().snapshot()); throw OperationFailedException( - ErrorReport::SEND_ERROR_REPORT, console, + ErrorReport::NO_ERROR_REPORT, console, "Unable to escape from being attacked.", true ); diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp index b20e3de13..3c0b70511 100644 --- a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp +++ b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp @@ -117,7 +117,7 @@ void find_and_center_on_sky( while (true){ if (current_time() - start > std::chrono::minutes(1)){ throw OperationFailedException( - ErrorReport::SEND_ERROR_REPORT, console, + ErrorReport::NO_ERROR_REPORT, console, "Failed to find the sky after 1 minute. (state = " + std::to_string((int)state) + ")", true ); diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp index 36adcb1e7..5edc6bea9 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp @@ -225,8 +225,8 @@ CatchResults basic_catcher( } last_move_attack = false; -#if 0 pbf_press_button(context, BUTTON_X, 20, 105); +#if 0 context.wait_for_all_requests(); BattleBallReader reader(console, language, COLOR_RED); int16_t qty = move_to_ball(reader, console, context, ball_slug); diff --git a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp b/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp index 071f67fb4..df1137504 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp @@ -4,6 +4,7 @@ * */ +#include #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Common/Cpp/Concurrency/AsyncDispatcher.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"