Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some utf-8 decoding for Japanese and tweaked card text formating for multi-encoding support.

Browse Source
This commit is contained in:
linshier
2010-11-29 17:40:21 +00:00
parent 0c9f5cd558
commit 970cd456de
3 changed files with 141 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
projects/mtg/src/CardPrimitive.cpp
View File

@@ -64,63 +64,8 @@ const vector<string>& CardPrimitive::formattedText()
s[found] = '/';
found = s.find_first_of("{}", found + 1);
}
while (s.length() > 0)
{
std::string::size_type len = neofont ? 24 : 33;
std::string::size_type cut = s.find_first_of("., \t)", 0);
if (cut >= len || cut == string::npos)
{
// Fix for single byte character in some complex language like Chinese
u8 * src = (u8 *) s.c_str();
if (neofont)
{
len = 0;
std::string::size_type limit = 24;
while (*src != 0)
{
if (*src > 0x80)
{ // Non-ASCII
if (len + 2 > limit && !(((*src & 0xF0) == 0xA0) && ((*(src + 1) & 0xF0) == 0xA0)))
break;
src += 2;
len += 2;
}
else
{ // ASCII
if (*src == '/' && (*(src + 1) & 0xF0) == 0xA0)
limit += 3;
if (len + 1 > limit && (*src == '+' || *src == '-' || *src == '/'))
break;
src += 1;
len += 1;
}
}
}
ftdText.push_back(s.substr(0, len));
if (s.length() > len)
s = s.substr(len, s.length() - len);
else
s = "";
}
else
{
std::string::size_type newcut = cut;
while (newcut < len && newcut != string::npos)
{
// neofont use space to separate one line
u8 * src = (u8 *) s.c_str();
if (neofont && *src > 0x80)
break;
cut = newcut;
newcut = s.find_first_of("., \t)", newcut + 1);
}
ftdText.push_back(s.substr(0, cut + 1));
if (s.length() > cut + 1)
s = s.substr(cut + 1, s.length() - cut - 1);
else
s = "";
}
}
WFont * mFont = resources.GetWFont(Fonts::MAGIC_FONT);
mFont->FormatText(s, ftdText);
}
return ftdText;
}