diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-06-27 20:23:44 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-06-27 20:23:44 +1000 |
commit | 332983c97b7a729c4dc5f19aa9ee4a22c420f7d8 (patch) | |
tree | fd9c441b796b522bdd5c7f8fbd32f51b8eff2a28 /source/rendering | |
parent | 14b9689b6d4f4ad5276c88130dc6e449bedc0709 (diff) |
The Formatting String Catastrophe
Diffstat (limited to 'source/rendering')
-rw-r--r-- | source/rendering/StarTextPainter.cpp | 2 | ||||
-rw-r--r-- | source/rendering/StarTilePainter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/rendering/StarTextPainter.cpp b/source/rendering/StarTextPainter.cpp index 5de04ac..6db4a34 100644 --- a/source/rendering/StarTextPainter.cpp +++ b/source/rendering/StarTextPainter.cpp @@ -7,7 +7,7 @@ namespace Star { namespace Text { String stripEscapeCodes(String const& s) { - String regex = strf("\\%s[^;]*%s", CmdEsc, EndEsc); + String regex = strf("\\{}[^;]*{}", CmdEsc, EndEsc); return std::regex_replace(s.utf8(), std::regex(regex.utf8()), ""); } diff --git a/source/rendering/StarTilePainter.cpp b/source/rendering/StarTilePainter.cpp index dce4fac..68e1110 100644 --- a/source/rendering/StarTilePainter.cpp +++ b/source/rendering/StarTilePainter.cpp @@ -310,7 +310,7 @@ bool TilePainter::produceTerrainPrimitives(HashMap<QuadZLevel, List<RenderPrimit if (hue == 0) texture = piece->texture; else - texture = strf("%s?hueshift=%s", piece->texture, materialHueToDegrees(hue)); + texture = strf("{}?hueshift={}", piece->texture, materialHueToDegrees(hue)); return m_textureGroup->create(*assets->image(texture)); }); |