From 89bba618fba6fdd6fba26f19a7fa6777520e7888 Mon Sep 17 00:00:00 2001 From: William JCM Date: Sun, 6 Mar 2022 14:30:04 +0100 Subject: [PATCH] SaveTool: eliminate a few format warnings. --- src/SaveTool/SaveTool_MainManager.cpp | 6 +++--- src/SaveTool/SaveTool_MassViewer.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SaveTool/SaveTool_MainManager.cpp b/src/SaveTool/SaveTool_MainManager.cpp index fd8a97a..24b0d3c 100644 --- a/src/SaveTool/SaveTool_MainManager.cpp +++ b/src/SaveTool/SaveTool_MainManager.cpp @@ -188,10 +188,10 @@ void SaveTool::drawGeneralInfo() { ImGui::TextUnformatted("Story progress:"); ImGui::SameLine(0.0f, ImGui::GetStyle().ItemSpacing.x / 4.0f); if(!it->after) { - ImGui::TextWrapped("%s - %s", it->chapter, it->point); + ImGui::TextWrapped("%s - %s", it->chapter.data(), it->point.data()); } else { - ImGui::TextWrapped("%s - %s - %s", it->chapter, it->after, it->point); + ImGui::TextWrapped("%s - %s - %s", it->chapter.data(), it->after.data(), it->point.data()); } } else { @@ -199,7 +199,7 @@ void SaveTool::drawGeneralInfo() { } if(mission_id_map.find(_currentProfile->lastMissionId()) != mission_id_map.cend()) { - ImGui::Text("Last mission: %s", mission_id_map.at(_currentProfile->lastMissionId())); + ImGui::Text("Last mission: %s", mission_id_map.at(_currentProfile->lastMissionId()).data()); } else if(_currentProfile->lastMissionId() == -1) { ImGui::TextUnformatted("Last mission: none"); diff --git a/src/SaveTool/SaveTool_MassViewer.cpp b/src/SaveTool/SaveTool_MassViewer.cpp index 0941440..0189029 100644 --- a/src/SaveTool/SaveTool_MassViewer.cpp +++ b/src/SaveTool/SaveTool_MassViewer.cpp @@ -491,7 +491,7 @@ void SaveTool::drawAccessoryEditor(Accessory& accessory, Containers::ArrayView"); } else if(accessories.find(accessory.id) != accessories.cend()) { - ImGui::Text("Accessory #%i - %s", accessory.id, accessories.at(accessory.id)); + ImGui::Text("Accessory #%i - %s", accessory.id, accessories.at(accessory.id).data()); } else { ImGui::Text("Accessory #%i", accessory.id);