Merge branch 'dev' of https://github.com/gwdevhub/GWToolboxpp into dev

gwdevhub · Jun 19, 2024 · 7414379 · 7414379
2 parents 96a52e1 + a3ef52d
commit 7414379
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 47 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(gwtoolbox)
 
 set(GWTOOLBOXEXE_VERSION "4.0")
 set(GWTOOLBOXDLL_VERSION "6.21")
-set(GWTOOLBOXDLL_VERSION_BETA "beta1") # can be anything. Marks beta version if not empty.
+set(GWTOOLBOXDLL_VERSION_BETA "beta2") # can be anything. Marks beta version if not empty.
 set(GWTOOLBOX_MODULE_VERSION "6,21,0,0") # used for Dll module info. See GWToolboxdll/GWToolbox.rc
 
 # this is no longer required, but in case we have to add an installer again some day

diff --git a/GWToolboxdll/Modules/ChatCommands.cpp b/GWToolboxdll/Modules/ChatCommands.cpp
@@ -27,6 +27,7 @@
 #include <GWCA/Managers/AgentMgr.h>
 #include <GWCA/Managers/CameraMgr.h>
 #include <GWCA/Managers/MemoryMgr.h>
+#include <GWCA/Managers/QuestMgr.h>
 #include <GWCA/Managers/PlayerMgr.h>
 #include <GWCA/Managers/SkillbarMgr.h>
 #include <GWCA/Managers/FriendListMgr.h>
@@ -43,7 +44,6 @@
 #include <Logger.h>
 
 #include <Modules/ChatCommands.h>
-#include <Modules/ObserverModule.h>
 #include <Modules/GameSettings.h>
 #include <Modules/ChatSettings.h>
 #include <Modules/InventoryManager.h>
@@ -56,8 +56,6 @@
 #include <Modules/HallOfMonumentsModule.h>
 #include <Modules/DialogModule.h>
 #include <Modules/Resources.h>
-#include <GWCA/Managers/QuestMgr.h>
-#include <Widgets/BondsWidget.h>
 
 constexpr auto CMDTITLE_KEEP_CURRENT = 0xfffe;
 constexpr auto CMDTITLE_REMOVE_CURRENT = 0xffff;

diff --git a/GWToolboxdll/Modules/Updater.cpp b/GWToolboxdll/Modules/Updater.cpp
@@ -9,11 +9,11 @@
 
 namespace {
  // 0=none, 1=check and warn, 2=check and ask, 3=check and do
- enum class ReleaseType : uint8_t {
+ enum class ReleaseType : int {
  Stable,
  Beta
  };
- enum class Mode : uint8_t {
+ enum class Mode : int {
  DontCheckForUpdates,
  CheckAndWarn,
  CheckAndAsk,
@@ -101,6 +101,10 @@ namespace {
  }
  release->download_url = asset["browser_download_url"].get<std::string>();
  release->version = tag_name.substr(0, version_number_len);
+ if (is_prerelease) {
+ release->version += tag_name.substr(version_number_len + 1);
+ }
+ std::ranges::transform(release->version, release->version.begin(), [](const auto chr) { return static_cast<char>(std::tolower(chr)); });
  release->body = js["body"].get<std::string>();
  release->size = asset["size"].get<uintmax_t>();
  return release;
@@ -119,6 +123,7 @@ namespace {
  out->size = std::filesystem::file_size(path);
  out->version = GWTOOLBOXDLL_VERSION;
  out->version.append(GWTOOLBOXDLL_VERSION_BETA);
+ std::ranges::transform(out->version, out->version.begin(), [](const auto chr) { return static_cast<char>(std::tolower(chr)); });
  return out;
  }
 
@@ -208,7 +213,7 @@ void Updater::LoadSettings(ToolboxIni* ini)
 {
  ToolboxModule::LoadSettings(ini);
 #ifdef _DEBUG
- mode = static_cast<Mode>(0);
+ mode = Mode::DontCheckForUpdates;
  release_type = ReleaseType::Beta;
 #else
  mode = static_cast<Mode>(ini->GetLongValue(Name(), "update_mode", static_cast<int>(mode)));

diff --git a/GWToolboxdll/Widgets/EffectsMonitorWidget.cpp b/GWToolboxdll/Widgets/EffectsMonitorWidget.cpp
@@ -4,19 +4,12 @@
 
 #include <GWCA/Context/WorldContext.h>
 
-#include <GWCA/Packets/StoC.h>
-
 #include <GWCA/GameEntities/Skill.h>
 
-#include <GWCA/Managers/AgentMgr.h>
 #include <GWCA/Managers/EffectMgr.h>
-#include <GWCA/Managers/SkillbarMgr.h>
 #include <GWCA/Managers/MapMgr.h>
 #include <GWCA/Managers/UIMgr.h>
-#include <GWCA/Managers/StoCMgr.h>
 #include <GWCA/Managers/GameThreadMgr.h>
-#include <GWCA/Managers/RenderMgr.h>
-#include <GWCA/Managers/MemoryMgr.h>
 
 #include <Utils/GuiUtils.h>
 #include <Color.h>

diff --git a/GWToolboxdll/Windows/Hotkeys.cpp b/GWToolboxdll/Windows/Hotkeys.cpp
@@ -1476,9 +1476,6 @@ bool HotkeyAction::GetText(void*, int idx, const char** out_text)
  case OpenXunlaiChest:
  *out_text = "Open Xunlai Chest";
  return true;
- case OpenLockedChest:
- *out_text = "Open Locked Chest";
- return true;
  case DropGoldCoin:
  *out_text = "Drop Gold Coin";
  return true;
@@ -1529,16 +1526,6 @@ void HotkeyAction::Execute()
  GW::Items::OpenXunlaiWindow();
  });
  break;
- case OpenLockedChest: {
- if (isExplorable()) {
- const GW::Agent* target = GW::Agents::GetTarget();
- if (target && target->GetIsGadgetType()) {
- GW::Agents::InteractAgent(target);
- GW::Items::OpenLockedChest();
- }
- }
- break;
- }
  case DropGoldCoin:
  if (isExplorable()) {
  GW::Items::DropGold(1);

diff --git a/GWToolboxdll/Windows/Hotkeys.h b/GWToolboxdll/Windows/Hotkeys.h
@@ -262,16 +262,15 @@ class HotkeyAction : public TBHotkey {
 
  enum Action {
  OpenXunlaiChest,
- OpenLockedChest,
- DropGoldCoin,
+ DropGoldCoin = 2,
  ReapplyTitle,
  EnterChallenge,
  };
 
  static bool GetText(void*, int idx, const char** out_text);
 
 public:
- Action action;
+ Action action = OpenXunlaiChest;
 
  static const char* IniSection() { return "Action"; }
  [[nodiscard]] const char* Name() const override { return IniSection(); }

diff --git a/GWToolboxdll/Windows/InfoWindow.cpp b/GWToolboxdll/Windows/InfoWindow.cpp
@@ -953,35 +953,28 @@ namespace {
  [[maybe_unused]] const GW::Chat::ChatBuffer* log = GW::Chat::GetChatLog();
  [[maybe_unused]] const GW::AreaInfo* ai = GW::Map::GetMapInfo(GW::Map::GetMapID());
 
+#ifdef _DEBUG
  const auto frame = GW::UI::GetFrameByLabel(L"NPCInteract");
  if (frame && frame->IsVisible()) {
  auto dialog_buttons_frame = GW::UI::GetChildFrame(frame, 2); // Scrollable frame
  dialog_buttons_frame = GW::UI::GetChildFrame(dialog_buttons_frame, 0);
  dialog_buttons_frame = GW::UI::GetChildFrame(dialog_buttons_frame, 0);
  dialog_buttons_frame = GW::UI::GetChildFrame(dialog_buttons_frame, 1);
  if (dialog_buttons_frame) {
- auto relation = dialog_buttons_frame->relation;
- auto& siblings = dialog_buttons_frame->relation.siblings;
- siblings.
- do {
- const auto frame = sibling->Next();
- if (!frame) break;
- if (frame == relation) break;
- sibling = sibling->Next();
-
- }
-
- for(auto button_frame : siblings){
- const auto button_frame = (*it)->GetFrame();
+ for (auto& sibling : dialog_buttons_frame->relation.siblings) {
+ const auto button_frame = sibling.GetFrame();
+ if (button_frame->child_offset_id != 0x1)
+ continue; // Not a button frame
  const auto top_left = button_frame->position.GetTopLeftOnScreen(frame);
  const auto bottom_right = button_frame->position.GetBottomRightOnScreen(frame);
- ImGui::GetBackgroundDrawList()->AddRect({ top_left.x,top_left.y }, { bottom_right.x,bottom_right.y }, IM_COL32_WHITE);
+ const auto label = std::to_string(button_frame->field100_0x1a8);
+ const auto draw_list = ImGui::GetBackgroundDrawList();
+ draw_list->AddRect({ top_left.x, top_left.y }, { bottom_right.x, bottom_right.y }, IM_COL32_WHITE);
+ draw_list->AddText({ top_left.x, top_left.y }, IM_COL32_WHITE, label.c_str());
  }
  }
-
  }
-
- (frame);
+#endif
  }
 }