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

Merge branch 'master' of https://github.com/WagicProject/wagic into cmake

Browse Source
This commit is contained in:
xawotihs
2017-09-02 21:15:47 +02:00
parent 2b342ca33b 07e6d90c98
commit 15111d1b20
541 changed files with 95355 additions and 35840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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)");