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/StarTerrainDatabase.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/game/StarTerrainDatabase.cpp') diff --git a/source/game/StarTerrainDatabase.cpp b/source/game/StarTerrainDatabase.cpp index 22f9365..a2b33fd 100644 --- a/source/game/StarTerrainDatabase.cpp +++ b/source/game/StarTerrainDatabase.cpp @@ -65,7 +65,7 @@ TerrainDatabase::TerrainDatabase() { auto parameters = assets->json(path); auto name = parameters.getString("name"); if (m_terrainSelectors.contains(name)) - throw TerrainException(strf("Duplicate terrain generator name '%s'", name)); + throw TerrainException(strf("Duplicate terrain generator name '{}'", name)); m_terrainSelectors[name] = {type, parameters}; } }; @@ -81,7 +81,7 @@ TerrainDatabase::TerrainDatabase() { auto name = parameters.getString("name"); auto type = parameters.getString("type"); if (m_terrainSelectors.contains(name)) - throw TerrainException(strf("Duplicate composed terrain generator name '%s'", name)); + throw TerrainException(strf("Duplicate composed terrain generator name '{}'", name)); m_terrainSelectors[name] = {type, parameters}; } } @@ -90,7 +90,7 @@ TerrainDatabase::Config TerrainDatabase::selectorConfig(String const& name) cons if (auto config = m_terrainSelectors.maybe(name)) return config.take(); else - throw TerrainException(strf("No such terrain selector '%s'", name)); + throw TerrainException(strf("No such terrain selector '{}'", name)); } TerrainSelectorConstPtr TerrainDatabase::createNamedSelector(String const& name, TerrainSelectorParameters const& parameters) const { @@ -149,7 +149,7 @@ TerrainSelectorConstPtr TerrainDatabase::createSelectorType(String const& type, else if (type == CacheSelector::Name) return make_shared(config, parameters, this); else - throw TerrainException(strf("Unknown terrain selector type '%s'", type)); + throw TerrainException(strf("Unknown terrain selector type '{}'", type)); } } -- cgit v1.2.3