ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit changes I forgot in previous commit

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11127 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2012-04-18 22:59:56 +00:00
parent e7acddc195
commit eacad59d20
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/guiengine/scalable_font.cpp
View File

@ -89,6 +89,9 @@ void ScalableFont::setShadow(const irr::video::SColor &col)
void ScalableFont::doReadXmlFile(io::IXMLReader* xml) void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
{ {
int trim_top = 0;
int trim_bottom = 0;
while (xml->read()) while (xml->read())
{ {
if (io::EXN_ELEMENT == xml->getNodeType()) if (io::EXN_ELEMENT == xml->getNodeType())
@ -96,6 +99,18 @@ void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
if (core::stringw(L"include") == xml->getNodeName()) if (core::stringw(L"include") == xml->getNodeName())
{ {
core::stringc filename = xml->getAttributeValue(L"file"); core::stringc filename = xml->getAttributeValue(L"file");
/*
const wchar_t* iflangis = xml->getAttributeValue(L"iflanguage");
printf("langcode = %s\n", translations->getCurrentLanguageCode().c_str());
if (iflangis != NULL &&
core::stringc(iflangis) != translations->getCurrentLanguageCode().c_str())
{
continue;
}
*/
io::IXMLReader* included = file_manager->createXMLReader( io::IXMLReader* included = file_manager->createXMLReader(
file_manager->getFontFile(filename.c_str())); file_manager->getFontFile(filename.c_str()));
if (included != NULL) if (included != NULL)
@ -142,6 +157,11 @@ void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
m_texture_files[i] = info; m_texture_files[i] = info;
} }
else if (core::stringw(L"font") == xml->getNodeName())
{
trim_top = (u32)xml->getAttributeValueAsInt(L"trim_top"); // returns 0 if no such attribute
trim_bottom = (u32)xml->getAttributeValueAsInt(L"trim_bottom");
}
else if (core::stringw(L"c") == xml->getNodeName()) else if (core::stringw(L"c") == xml->getNodeName())
{ {
// adding a character to this font // adding a character to this font
@ -178,7 +198,7 @@ void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
val += *c - '0'; val += *c - '0';
c++; c++;
} }
rectangle.UpperLeftCorner.Y = val; rectangle.UpperLeftCorner.Y = val + trim_top;
while (*c == L' ' || *c == L',') c++; while (*c == L' ' || *c == L',') c++;
val = 0; val = 0;
@ -198,7 +218,7 @@ void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
val += *c - '0'; val += *c - '0';
c++; c++;
} }
rectangle.LowerRightCorner.Y = val; rectangle.LowerRightCorner.Y = val - trim_bottom;
CharacterMap[ch] = Areas.size(); CharacterMap[ch] = Areas.size();