MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DrawStringWithColors: Fix {} support

Browse source
This commit is contained in:
Gleb Mazovetskiy 2021-11-25 10:32:25 +00:00 • committed by Anders Jenbo
commit bffe7dd071
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/engine/render/text_render.cpp
View file

@ -218,17 +218,19 @@ public:
if (rest[0] != '{')
return result;
std::size_t fmtLen;
std::size_t closingBracePos;
bool positional;
if (rest.empty() || (rest[1] != '}' && rest.size() < 3)) {
std::size_t closingBracePos = rest.find('}', 1);
if (closingBracePos == string_view::npos) {
LogError("Unclosed format argument: {}", fmt_);
return result;
}
if (rest[2] == '}' && rest[1] >= '0' && rest[1] <= '9') {
std::size_t fmtLen;
bool positional;
if (closingBracePos == 2 && rest[1] >= '0' && rest[1] <= '9') {
result = rest[1] - '0';
fmtLen = 3;
positional = true;
} else if ((closingBracePos = rest.find('}', 1)) != string_view::npos) {
} else {
result = next_++;
fmtLen = closingBracePos + 1;
positional = false;