archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-22 01:49:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

CFont crash workaround

Browse Source
This commit is contained in:
eray orçunus
2020-06-06 19:25:37 +03:00
parent 4e4a3489ef
commit fc0498b3a8
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/render/Font.cpp
View File

@ -936,15 +936,27 @@ CFont::GetStringWidth(wchar *s, bool spaces)
} else
#endif
{
for (; (*s != ' ' || spaces) && *s != '\0'; s++) {
if (*s == '~') {
for (wchar c = *s; (c != ' ' || spaces) && c != '\0'; c = *(++s)) {
if (c == '~') {
// This is original code
#if 0
s++;
while (*s != '~') s++;
s++;
if (*s == ' ' && !spaces)
break;
while (*s != '~') {
s++;
}
#else
// TODO(Miami): This is my code to prevent fuck up until InsertPlayerControlKeysInString is done
if (*(s + 1) != '~') {
s++;
while (*s != '~') {
s++;
}
}
#endif
} else {
w += GetCharacterSize(c - ' ');
}
w += GetCharacterSize(*s - ' ');
}
}
return w;