From 332983c97b7a729c4dc5f19aa9ee4a22c420f7d8 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Tue, 27 Jun 2023 20:23:44 +1000 Subject: The Formatting String Catastrophe --- source/game/StarRadioMessageDatabase.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/game/StarRadioMessageDatabase.cpp') diff --git a/source/game/StarRadioMessageDatabase.cpp b/source/game/StarRadioMessageDatabase.cpp index 8aa5dd5..2a22fe1 100644 --- a/source/game/StarRadioMessageDatabase.cpp +++ b/source/game/StarRadioMessageDatabase.cpp @@ -19,12 +19,12 @@ RadioMessageDatabase::RadioMessageDatabase() { Json messages = assets->json(file); for (auto pair : messages.iterateObject()) { if (m_radioMessages.contains(pair.first)) - throw RadioMessageDatabaseException(strf("Duplicate radiomessage %s in file %s", pair.first, file)); + throw RadioMessageDatabaseException(strf("Duplicate radiomessage {} in file {}", pair.first, file)); m_radioMessages[pair.first] = createRadioMessage(pair.second, pair.first); } } catch (std::exception const& e) { - throw RadioMessageDatabaseException(strf("Error loading radiomessages file %s", file), e); + throw RadioMessageDatabaseException(strf("Error loading radiomessages file {}", file), e); } } } @@ -32,7 +32,7 @@ RadioMessageDatabase::RadioMessageDatabase() { RadioMessage RadioMessageDatabase::radioMessage(String const& messageName) const { if (auto message = m_radioMessages.maybe(messageName)) return message.take(); - throw RadioMessageDatabaseException(strf("Unknown radio message %s", messageName)); + throw RadioMessageDatabaseException(strf("Unknown radio message {}", messageName)); } RadioMessage RadioMessageDatabase::createRadioMessage(Json const& config, Maybe const& messageId) const { @@ -65,7 +65,7 @@ RadioMessage RadioMessageDatabase::createRadioMessage(Json const& config, Maybe< if (message.portraitFrames <= 0) throw RadioMessageDatabaseException( - strf("Invalid portraitFrames %s in radio message config!", message.portraitFrames)); + strf("Invalid portraitFrames {} in radio message config!", message.portraitFrames)); return message; } else { -- cgit v1.2.3