From 777f3a2819abe9392fea96d28672030b51d61bb3 Mon Sep 17 00:00:00 2001 From: lhhxxxxx <91231470+lhhxxxxx@users.noreply.github.com> Date: Sun, 31 Jul 2022 22:26:43 +0800 Subject: [PATCH] =?UTF-8?q?fix.=20=E4=BF=AE=E5=A4=8Dc++17=E9=99=A4meojson?= =?UTF-8?q?=E5=A4=96=E7=9A=84g++=20warning=20style.=20=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README_en-US.md | 2 +- docs/en/CONTRIBUTING.md | 2 +- src/MeoAssistant/AsstTypes.h | 3 +++ src/MeoAssistant/AsstUtils.hpp | 9 +++++++++ src/MeoAssistant/BattleDataConfiger.h | 2 +- src/MeoAssistant/BattleProcessTask.cpp | 6 ++++++ src/MeoAssistant/Controller.h | 3 +++ src/MeoAssistant/RoguelikeTask.cpp | 2 +- 8 files changed, 25 insertions(+), 4 deletions(-) diff --git a/README_en-US.md b/README_en-US.md index 6b831fa502..30eab449e1 100644 --- a/README_en-US.md +++ b/README_en-US.md @@ -147,7 +147,7 @@ Please refer to [Linux Tutorial](docs/en/LINUX_TUTORIAL.md) - [Task Schema](docs/en/TASK_SCHEMA.md) - [Copilot Schema](docs/en/COPILOT_SCHEMA.md) -### For Novice Users of Github +### For Novice Users of GitHub [Contributing](docs/en/CONTRIBUTING.md) diff --git a/docs/en/CONTRIBUTING.md b/docs/en/CONTRIBUTING.md index 96a82d35b0..6a6015ed5f 100644 --- a/docs/en/CONTRIBUTING.md +++ b/docs/en/CONTRIBUTING.md @@ -44,4 +44,4 @@ 4. Repeat step 7-10. -Note: operations regarding to Git can be done by VS2022 instead of command line tools, using the Git changes tab. +Note: operations regarding Git can be done by VS2022 instead of command line tools, using the Git changes tab. diff --git a/src/MeoAssistant/AsstTypes.h b/src/MeoAssistant/AsstTypes.h index 8bfa91dd05..c480fae917 100644 --- a/src/MeoAssistant/AsstTypes.h +++ b/src/MeoAssistant/AsstTypes.h @@ -8,7 +8,10 @@ #include #include #include + +#ifndef NOMINMAX #define NOMINMAX +#endif namespace json { diff --git a/src/MeoAssistant/AsstUtils.hpp b/src/MeoAssistant/AsstUtils.hpp index f1ef8fe657..4c979f5ccf 100644 --- a/src/MeoAssistant/AsstUtils.hpp +++ b/src/MeoAssistant/AsstUtils.hpp @@ -201,7 +201,10 @@ namespace asst::utils auto pipe_buffer = std::make_unique(PipeBuffSize); #ifdef _WIN32 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" SECURITY_ATTRIBUTES pipe_sec_attr = { 0 }; +#pragma GCC diagnostic pop pipe_sec_attr.nLength = sizeof(SECURITY_ATTRIBUTES); pipe_sec_attr.lpSecurityDescriptor = nullptr; pipe_sec_attr.bInheritHandle = TRUE; @@ -209,14 +212,20 @@ namespace asst::utils HANDLE pipe_child_write = nullptr; CreatePipe(&pipe_read, &pipe_child_write, &pipe_sec_attr, PipeBuffSize); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" STARTUPINFOA si = { 0 }; +#pragma GCC diagnostic pop si.cb = sizeof(STARTUPINFO); si.dwFlags = STARTF_USESTDHANDLES; si.wShowWindow = SW_HIDE; si.hStdOutput = pipe_child_write; si.hStdError = pipe_child_write; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" PROCESS_INFORMATION pi = { nullptr }; +#pragma GCC diagnostic pop BOOL p_ret = CreateProcessA(nullptr, const_cast(cmdline.c_str()), nullptr, nullptr, TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi); if (p_ret) { diff --git a/src/MeoAssistant/BattleDataConfiger.h b/src/MeoAssistant/BattleDataConfiger.h index 7984e442f8..fad641eaca 100644 --- a/src/MeoAssistant/BattleDataConfiger.h +++ b/src/MeoAssistant/BattleDataConfiger.h @@ -40,7 +40,7 @@ namespace asst return EmptyRange; } const auto& ranges = char_iter->second.ranges; - if (index < 0 || index >= ranges.size()) { + if (index >= ranges.size()) { if (ranges.empty()) { return EmptyRange; } diff --git a/src/MeoAssistant/BattleProcessTask.cpp b/src/MeoAssistant/BattleProcessTask.cpp index 05613084d9..f946d4c45d 100644 --- a/src/MeoAssistant/BattleProcessTask.cpp +++ b/src/MeoAssistant/BattleProcessTask.cpp @@ -327,6 +327,10 @@ bool asst::BattleProcessTask::do_action(const BattleAction& action) case BattleActionType::BulletTime: action_desc = "子弹时间"; break; + // TODO 其他情况 + case BattleActionType::SkillUsage: + case BattleActionType::UseAllSkill: + case BattleActionType::Output:; } details["action"] = action_desc; details["doc"] = action.doc; @@ -372,6 +376,8 @@ bool asst::BattleProcessTask::do_action(const BattleAction& action) case BattleActionType::SkillDaemon: ret = wait_to_end(action); break; + // TODO 其他情况 + case BattleActionType::UseAllSkill:; } sleep_with_possible_skill(action.rear_delay); diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index ff5e64d644..0e2bf7219a 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -100,12 +100,15 @@ namespace asst HANDLE m_pipe_write = nullptr; // 写管道句柄 HANDLE m_pipe_child_read = nullptr; // 子进程的读管道句柄 HANDLE m_pipe_child_write = nullptr; // 子进程的写管道句柄 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" SECURITY_ATTRIBUTES m_pipe_sec_attr = { 0 }; // 管道安全描述符 STARTUPINFOA m_child_startup_info = { 0 }; // 子进程启动信息 WSADATA m_wsa_data = { 0 }; SOCKET m_server_sock = 0ULL; sockaddr_in m_server_addr = { 0 }; +#pragma GCC diagnostic pop #else constexpr static int PIPE_READ = 0; constexpr static int PIPE_WRITE = 1; diff --git a/src/MeoAssistant/RoguelikeTask.cpp b/src/MeoAssistant/RoguelikeTask.cpp index e8793b3b85..22588255e4 100644 --- a/src/MeoAssistant/RoguelikeTask.cpp +++ b/src/MeoAssistant/RoguelikeTask.cpp @@ -42,7 +42,7 @@ asst::RoguelikeTask::RoguelikeTask(const AsstCallback& callback, void* callback_ bool asst::RoguelikeTask::set_params(const json::value& params) { - // 0 - 刷蜡烛，尽可能稳定的打更多层数 + // 0 - 刷蜡烛，尽可能稳定地打更多层数 // 1 - 刷源石锭，第一层投资完就退出 // 2 - 【弃用】两者兼顾，投资过后再退出，没有投资就继续往后打 // 3 - 尝试通关，激进策略