From bee4194f9e12c9d2210a5ecba7249bdfe3f3deda Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Tue, 14 May 2024 12:53:59 -0400 Subject: Switch to wx logging --- src/game_data.cpp | 59 ++++++++++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) (limited to 'src/game_data.cpp') diff --git a/src/game_data.cpp b/src/game_data.cpp index 74f872c..7bc3134 100644 --- a/src/game_data.cpp +++ b/src/game_data.cpp @@ -31,9 +31,7 @@ LingoColor GetColorForString(const std::string &str) { } else if (str == "purple") { return LingoColor::kPurple; } else { - std::ostringstream errmsg; - errmsg << "Invalid color: " << str; - TrackerLog(errmsg.str()); + wxLogError("Invalid color: %s", str); return LingoColor::kNone; } @@ -83,9 +81,7 @@ struct GameData { ap_id_by_color_[GetColorForString(input_name)] = ids_config["special_items"][color_name].as(); } else { - std::ostringstream errmsg; - errmsg << "Missing AP item ID for color " << color_name; - TrackerLog(errmsg.str()); + wxLogError("Missing AP item ID for color %s", color_name); } }; @@ -160,8 +156,9 @@ struct GameData { } default: { // This shouldn't happen. - std::cout << "Error reading game data: " << entrance_it - << std::endl; + std::ostringstream formatted; + formatted << entrance_it; + wxLogError("Error reading game data: %s", formatted.str()); break; } } @@ -281,10 +278,8 @@ struct GameData { [panels_[panel_id].name] .as(); } else { - std::ostringstream errmsg; - errmsg << "Missing AP location ID for panel " - << rooms_[room_id].name << " - " << panels_[panel_id].name; - TrackerLog(errmsg.str()); + wxLogError("Missing AP location ID for panel %s - %s", + rooms_[room_id].name, panels_[panel_id].name); } } } @@ -347,10 +342,8 @@ struct GameData { [doors_[door_id].name]["item"] .as(); } else { - std::ostringstream errmsg; - errmsg << "Missing AP item ID for door " << rooms_[room_id].name - << " - " << doors_[door_id].name; - TrackerLog(errmsg.str()); + wxLogError("Missing AP item ID for door %s - %s", + rooms_[room_id].name, doors_[door_id].name); } } @@ -364,10 +357,8 @@ struct GameData { ids_config["door_groups"][doors_[door_id].group_name] .as(); } else { - std::ostringstream errmsg; - errmsg << "Missing AP item ID for door group " - << doors_[door_id].group_name; - TrackerLog(errmsg.str()); + wxLogError("Missing AP item ID for door group %s", + doors_[door_id].group_name); } } @@ -377,13 +368,11 @@ struct GameData { } else if (!door_it.second["skip_location"] && !door_it.second["event"]) { if (has_external_panels) { - std::ostringstream errmsg; - errmsg - << rooms_[room_id].name << " - " << doors_[door_id].name - << " has panels from other rooms but does not have an " - "explicit " - "location name and is not marked skip_location or event"; - TrackerLog(errmsg.str()); + wxLogError( + "%s - %s 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); } doors_[door_id].location_name = @@ -403,10 +392,8 @@ struct GameData { [doors_[door_id].name]["location"] .as(); } else { - std::ostringstream errmsg; - errmsg << "Missing AP location ID for door " - << rooms_[room_id].name << " - " << doors_[door_id].name; - TrackerLog(errmsg.str()); + wxLogError("Missing AP location ID for door %s - %s", + rooms_[room_id].name, doors_[door_id].name); } } @@ -472,10 +459,8 @@ struct GameData { progressive_item_id = ids_config["progression"][progressive_item_name].as(); } else { - std::ostringstream errmsg; - errmsg << "Missing AP item ID for progressive item " - << progressive_item_name; - TrackerLog(errmsg.str()); + wxLogError("Missing AP item ID for progressive item %s", + progressive_item_name); } int index = 1; @@ -606,9 +591,7 @@ struct GameData { // Report errors. for (const std::string &area : malconfigured_areas_) { - std::ostringstream errstr; - errstr << "Area data not found for: " << area; - TrackerLog(errstr.str()); + wxLogError("Area data not found for: %s", area); } // Read in subway items. -- cgit 1.4.1