1 files changed, 31 insertions, 32 deletions

@@ -1,11 +1,6 @@
 #include "game_data.h"
 
-#include <wx/wxprec.h>
-
-#ifndef WX_PRECOMP
-#include <wx/wx.h>
-#endif
-
+#include <fmt/core.h>
 #include <hkutil/string.h>
 #include <yaml-cpp/yaml.h>
 
@@ -13,6 +8,7 @@
 #include <sstream>
 
 #include "global.h"
+#include "logger.h"
 
 namespace {
 
@@ -36,7 +32,7 @@ LingoColor GetColorForString(const std::string &str) {
   } else if (str == "purple") {
     return LingoColor::kPurple;
   } else {
-    wxLogError("Invalid color: %s", str);
+    TrackerLog(fmt::format("Invalid color: {}", str));
 
     return LingoColor::kNone;
   }
@@ -88,7 +84,7 @@ struct GameData {
         ap_id_by_color_[GetColorForString(input_name)] =
             ids_config["special_items"][color_name].as<int>();
       } else {
-        wxLogError("Missing AP item ID for color %s", color_name);
+        TrackerLog(fmt::format("Missing AP item ID for color {}", color_name));
       }
     };
 
@@ -165,7 +161,8 @@ struct GameData {
             // This shouldn't happen.
             std::ostringstream formatted;
             formatted << entrance_it;
-            wxLogError("Error reading game data: %s", formatted.str());
+            TrackerLog(
+                fmt::format("Error reading game data: {}", formatted.str()));
             break;
           }
         }
@@ -290,8 +287,9 @@ struct GameData {
                           [panels_[panel_id].name]
                               .as<int>();
           } else {
-            wxLogError("Missing AP location ID for panel %s - %s",
-                       rooms_[room_id].name, panels_[panel_id].name);
+            TrackerLog(fmt::format("Missing AP location ID for panel {} - {}",
+                                   rooms_[room_id].name,
+                                   panels_[panel_id].name));
           }
         }
       }
@@ -354,8 +352,9 @@ struct GameData {
                             [doors_[door_id].name]["item"]
                                 .as<int>();
             } else {
-              wxLogError("Missing AP item ID for door %s - %s",
-                         rooms_[room_id].name, doors_[door_id].name);
+              TrackerLog(fmt::format("Missing AP item ID for door {} - {}",
+                                     rooms_[room_id].name,
+                                     doors_[door_id].name));
             }
           }
 
@@ -369,8 +368,8 @@ struct GameData {
                   ids_config["door_groups"][doors_[door_id].group_name]
                       .as<int>();
             } else {
-              wxLogError("Missing AP item ID for door group %s",
-                         doors_[door_id].group_name);
+              TrackerLog(fmt::format("Missing AP item ID for door group {}",
+                                     doors_[door_id].group_name));
             }
           }
 
@@ -380,11 +379,11 @@ struct GameData {
           } else if (!door_it.second["skip_location"] &&
                      !door_it.second["event"]) {
             if (has_external_panels) {
-              wxLogError(
-                  "%s - %s has panels from other rooms but does not have an "
+              TrackerLog(fmt::format(
+                  "{} - {} has panels from other rooms but does not have an "
                   "explicit location name and is not marked skip_location or "
                   "event",
-                  rooms_[room_id].name, doors_[door_id].name);
+                  rooms_[room_id].name, doors_[door_id].name));
             }
 
             doors_[door_id].location_name =
@@ -404,8 +403,9 @@ struct GameData {
                             [doors_[door_id].name]["location"]
                                 .as<int>();
             } else {
-              wxLogError("Missing AP location ID for door %s - %s",
-                         rooms_[room_id].name, doors_[door_id].name);
+              TrackerLog(fmt::format("Missing AP location ID for door {} - {}",
+                                     rooms_[room_id].name,
+                                     doors_[door_id].name));
             }
           }
 
@@ -473,8 +473,8 @@ struct GameData {
             progressive_item_id =
                 ids_config["progression"][progressive_item_name].as<int>();
           } else {
-            wxLogError("Missing AP item ID for progressive item %s",
-                       progressive_item_name);
+            TrackerLog(fmt::format("Missing AP item ID for progressive item {}",
+                                   progressive_item_name));
           }
 
           int index = 1;
@@ -553,14 +553,13 @@ struct GameData {
       int area_id = AddOrGetArea(area_name);
       MapArea &map_area = map_areas_[area_id];
       // room field should be the original room ID
-      map_area.locations.push_back(
-          {.name = section_name,
-           .ap_location_name = location_name,
-           .ap_location_id = panel.ap_location_id,
-           .room = panel.room,
-           .panels = {panel.id},
-           .classification = classification,
-           .hunt = panel.hunt});
+      map_area.locations.push_back({.name = section_name,
+                                    .ap_location_name = location_name,
+                                    .ap_location_id = panel.ap_location_id,
+                                    .room = panel.room,
+                                    .panels = {panel.id},
+                                    .classification = classification,
+                                    .hunt = panel.hunt});
       locations_by_name[location_name] = {area_id,
                                           map_area.locations.size() - 1};
     }
@@ -638,7 +637,7 @@ struct GameData {
 
     // Report errors.
     for (const std::string &area : malconfigured_areas_) {
-      wxLogError("Area data not found for: %s", area);
+      TrackerLog(fmt::format("Area data not found for: {}", area));
     }
 
     // Read in subway items.
@@ -709,7 +708,7 @@ struct GameData {
 
     for (const auto &[tag, items] : subway_tags) {
       if (items.size() == 1) {
-        wxLogWarning("Singleton subway item tag: %s", tag);
+        TrackerLog(fmt::format("Singleton subway item tag: {}", tag));
       }
     }
   }