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

customLen

Browse Source 
for formatting text on booster shop, we pass the desired length from
getformatted text with noremove(no removal of {}) enabled, if its not
enabled then default the value to zero(passing zero means use the
default values)
This commit is contained in:
Anthony Calosa
2017-02-25 07:27:57 +08:00
parent ec730a4383
commit ec078b6ccc
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/CardPrimitive.cpp
+2 -1
View File
@@ -312,8 +312,9 @@ const vector<string>& CardPrimitive::getFormattedText(bool noremove)
found = text.find_first_of("{}", found + 1);
}
}
int defL = noremove?44:0;
WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MAGIC_FONT);
mFont->FormatText(text, formattedText);
mFont->FormatText(text, formattedText, defL);
text = "";
projects/mtg/src/WFont.cpp
+6 -4
View File
@@ -115,10 +115,12 @@ WLBFont::WLBFont(int inFontID, const char *fontname, int lineheight, bool useVid
it = NEW JLBFont(path.c_str(), lineheight, useVideoRAM);
}
void WLBFont::FormatText(string &s, vector<string>& output)
void WLBFont::FormatText(string &s, vector<string>& output, int customLen)
{
int defL = (customLen>0)?customLen:30;
// The way of CardPrimitive::formattedText() in r2081.
std::string::size_type len = 30;
//std::string::size_type len = 30;
std::string::size_type len = defL;
while (s.length() > 0)
{
std::string::size_type cut = s.find_first_of("., \t)", 0);
@@ -1055,7 +1057,7 @@ int WGBKFont::GetMana(const u8 *ch) const
return mana;
}
void WGBKFont::FormatText(string &s, vector<string>& output)
void WGBKFont::FormatText(string &s, vector<string>& output, int customLen)
{
while (s.length() > 0)
{
@@ -1196,7 +1198,7 @@ int WUFont::GetMana(const u8 *ch) const
return -1;
}
void WUFont::FormatText(string &s, vector<string>& output)
void WUFont::FormatText(string &s, vector<string>& output, int customLen)
{
std::string::size_type limit = 22; //28
string delim("., \t)");