From 3f370c1bee5cee2140c27feddc79bf9e4b35ffb4 Mon Sep 17 00:00:00 2001 From: status102 Date: Tue, 14 Nov 2023 21:00:39 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E8=BF=81=E7=A7=BB=E8=82=89=E9=B8=BD?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/Interface/RoguelikeTask.cpp | 7 +------ src/MaaCore/Task/Roguelike/RoguelikeConfig.h | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/MaaCore/Task/Interface/RoguelikeTask.cpp b/src/MaaCore/Task/Interface/RoguelikeTask.cpp index 00bdc5dae1..c51188ea07 100644 --- a/src/MaaCore/Task/Interface/RoguelikeTask.cpp +++ b/src/MaaCore/Task/Interface/RoguelikeTask.cpp @@ -88,12 +88,7 @@ bool asst::RoguelikeTask::set_params(const json::value& params) } auto mode = static_cast(params.get("mode", 0)); - static constexpr std::array all_modes = { - RoguelikeMode::Exp, - RoguelikeMode::Investment, - RoguelikeMode::Collectible, - }; - if (ranges::find(all_modes, mode) == all_modes.end()) { + if (RoguelikeConfig::is_valid_mode(mode)) { m_roguelike_task_ptr->set_tasks({ "Stop" }); Log.error(__FUNCTION__, "| Unknown mode", static_cast(mode)); return false; diff --git a/src/MaaCore/Task/Roguelike/RoguelikeConfig.h b/src/MaaCore/Task/Roguelike/RoguelikeConfig.h index a75a2a8413..39e9688337 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeConfig.h +++ b/src/MaaCore/Task/Roguelike/RoguelikeConfig.h @@ -31,6 +31,12 @@ namespace asst { return theme == RoguelikeTheme::Phantom || theme == RoguelikeTheme::Mizuki || theme == RoguelikeTheme::Sami; } + static constexpr bool is_valid_mode(RoguelikeMode mode) + { + return mode == RoguelikeMode::Exp || mode == RoguelikeMode::Investment || + mode == RoguelikeMode::Collectible; + } + public: // 清理缓存的肉鸽数据 void clear();