6 files changed, 37 insertions, 21 deletions

@@ -2,3 +2,4 @@ build/
 builds/
 assets/LL1.yaml
 .DS_Store
+.vs
@@ -3,6 +3,11 @@ project (lingo_ap_tracker)
 
 set(CMAKE_BUILD_TYPE Debug)
 
+if (MSVC)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+set(CMAKE_WIN32_EXECUTABLE true)
+endif(MSVC)
+
 find_package(wxWidgets CONFIG REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(yaml-cpp REQUIRED)
@@ -36,6 +41,6 @@ add_executable(lingo_ap_tracker
   eye_indicator.cpp
   tracker_state.cpp
 )
-set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD 17)
+set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD 20)
 set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD_REQUIRED ON)
 target_link_libraries(lingo_ap_tracker PRIVATE OpenSSL::SSL OpenSSL::Crypto wx::core wx::base yaml-cpp)
@@ -1,8 +1,12 @@
 #include "ap_state.h"
 
-#include <hkutil/string.h>
+#define HAS_STD_FILESYSTEM
+#define _WEBSOCKETPP_CPP11_STRICT_
+#pragma comment(lib, "crypt32")
 
+#include <apclient.hpp>
 #include <apuuid.hpp>
+#include <hkutil/string.h>
 #include <chrono>
 #include <exception>
 #include <list>
@@ -17,13 +21,15 @@ constexpr int AP_REVISION = 0;
 
 constexpr int ITEM_HANDLING = 7;  // <- all
 
+static APClient* apclient = nullptr;
+
 APState::APState() {
   std::thread([this]() {
     for (;;) {
       {
         std::lock_guard client_guard(client_mutex_);
-        if (apclient_) {
-          apclient_->poll();
+        if (apclient) {
+          apclient->poll();
         }
       }
 
@@ -39,11 +45,13 @@ void APState::Connect(std::string server, std::string player,
   {
     std::lock_guard client_guard(client_mutex_);
 
-    if (apclient_) {
-      apclient_->reset();
+    if (apclient) {
+      apclient->reset();
+      delete apclient;
+      apclient = nullptr;
     }
 
-    apclient_ = std::make_unique<APClient>(ap_get_uuid(""), "Lingo", server);
+    apclient = new APClient(ap_get_uuid(""), "Lingo", server);
   }
 
   inventory_.clear();
@@ -52,15 +60,15 @@ void APState::Connect(std::string server, std::string player,
   bool connected = false;
   bool has_connection_result = false;
 
-  apclient_->set_room_info_handler([&]() {
+  apclient->set_room_info_handler([&]() {
     tracker_frame_->SetStatusMessage(
         "Connected to Archipelago server. Authenticating...");
 
-    apclient_->ConnectSlot(player, password, ITEM_HANDLING, {"Tracker"},
+    apclient->ConnectSlot(player, password, ITEM_HANDLING, {"Tracker"},
                            {AP_MAJOR, AP_MINOR, AP_REVISION});
   });
 
-  apclient_->set_location_checked_handler(
+  apclient->set_location_checked_handler(
       [&](const std::list<int64_t>& locations) {
         for (const int64_t location_id : locations) {
           checked_locations_.insert(location_id);
@@ -70,15 +78,15 @@ void APState::Connect(std::string server, std::string player,
         RefreshTracker();
       });
 
-  apclient_->set_slot_disconnected_handler([&]() {
+  apclient->set_slot_disconnected_handler([&]() {
     tracker_frame_->SetStatusMessage("Disconnected from Archipelago.");
   });
 
-  apclient_->set_socket_disconnected_handler([&]() {
+  apclient->set_socket_disconnected_handler([&]() {
     tracker_frame_->SetStatusMessage("Disconnected from Archipelago.");
   });
 
-  apclient_->set_items_received_handler(
+  apclient->set_items_received_handler(
       [&](const std::list<APClient::NetworkItem>& items) {
         for (const APClient::NetworkItem& item : items) {
           // TODO: Progressive items.
@@ -90,7 +98,7 @@ void APState::Connect(std::string server, std::string player,
         RefreshTracker();
       });
 
-  apclient_->set_slot_connected_handler([&](const nlohmann::json& slot_data) {
+  apclient->set_slot_connected_handler([&](const nlohmann::json& slot_data) {
     tracker_frame_->SetStatusMessage("Connected to Archipelago!");
 
     door_shuffle_mode_ = slot_data["shuffle_doors"].get<DoorShuffleMode>();
@@ -100,7 +108,7 @@ void APState::Connect(std::string server, std::string player,
     has_connection_result = true;
   });
 
-  apclient_->set_slot_refused_handler(
+  apclient->set_slot_refused_handler(
       [&](const std::list<std::string>& errors) {
         connected = false;
         has_connection_result = true;
@@ -163,7 +171,7 @@ void APState::Connect(std::string server, std::string player,
            section_id++) {
         const Location& location = map_area.locations.at(section_id);
 
-        int64_t ap_id = apclient_->get_location_id(location.ap_location_name);
+        int64_t ap_id = apclient->get_location_id(location.ap_location_name);
         if (ap_id == APClient::INVALID_NAME_ID) {
           std::cout << "Could not find AP location ID for "
                     << location.ap_location_name << std::endl;
@@ -232,7 +240,7 @@ void APState::RefreshTracker() {
 }
 
 int64_t APState::GetItemId(const std::string& item_name) {
-  int64_t ap_id = apclient_->get_item_id(item_name);
+  int64_t ap_id = apclient->get_item_id(item_name);
   if (ap_id == APClient::INVALID_NAME_ID) {
     std::cout << "Could not find AP item ID for " << item_name << std::endl;
   }
@@ -1,7 +1,6 @@
 #ifndef AP_STATE_H_664A4180
 #define AP_STATE_H_664A4180
 
-#include <apclient.hpp>
 #include <memory>
 #include <mutex>
 #include <set>
@@ -40,7 +39,6 @@ class APState {
 
   TrackerFrame* tracker_frame_;
 
-  std::unique_ptr<APClient> apclient_;
   bool client_active_ = false;
   std::mutex client_mutex_;
 
@@ -308,7 +308,10 @@ int GameData::AddOrGetDoor(std::string room, std::string door) {
 
   if (!door_by_id_.count(full_name)) {
     door_by_id_[full_name] = doors_.size();
-    doors_.push_back({.name = door, .room = AddOrGetRoom(room)});
+    doors_.push_back({
+        .room = AddOrGetRoom(room),
+        .name = door
+    });
   }
 
   return door_by_id_[full_name];
@@ -321,7 +324,7 @@ int GameData::AddOrGetPanel(std::string room, std::string panel) {
     int panel_id = panels_.size();
     panel_by_id_[full_name] = panel_id;
     panels_.push_back(
-        {.id = panel_id, .name = panel, .room = AddOrGetRoom(room)});
+        {.id = panel_id, .room = AddOrGetRoom(room), .name = panel});
   }
 
   return panel_by_id_[full_name];
@@ -2,6 +2,7 @@
 #define GAME_DATA_H_9C42AC51
 
 #include <map>
+#include <optional>
 #include <string>
 #include <vector>