real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Fixed minor bug when displaying text containing a "%". Used LOG_ONCE to avoid continuous error logging. Removed redundant Trim (Xeromyces always trims element text)

Browse Source 
This was SVN commit r1136.
This commit is contained in:
Ykkrosh 2004-09-06 11:34:46 +00:00
parent 7008e5b53c
commit a9d7f0dae8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/gui/CGUI.cpp
View File

@ -379,8 +379,7 @@ void CGUI::DrawSprite(const CStr& SpriteName,
// Fetch real sprite from name
if (m_Sprites.count(SpriteName) == 0)
{
LOG(ERROR, LOG_CATEGORY, "Trying to use a sprite that doesn't exist (\"%s\").", SpriteName.c_str());
// TODO Gee: (2004-08-31) This will be called continuously when it happens.
LOG_ONCE(ERROR, LOG_CATEGORY, "Trying to use a sprite that doesn't exist (\"%s\").", SpriteName.c_str());
return;
}
else Sprite = m_Sprites[SpriteName];
@ -929,7 +928,7 @@ void CGUI::DrawText(const SGUIText &Text, const CColor &DefaultColor,
// TODO Gee: (2004-09-04) Why are font corrupted if inputted float value?
glTranslatef((GLfloat)int(pos.x+it->m_Pos.x), (GLfloat)int(pos.y+it->m_Pos.y), z);
glColor4f(color.r, color.g, color.b, color.a);
glwprintf(it->m_String);
glwprintf("%ls", it->m_String); // "%ls" is necessary in case m_String contains % symbols
glPopMatrix();
@ -1287,7 +1286,6 @@ void CGUI::Xeromyces_ReadObject(XMBElement Element, CXeromyces* pFile, IGUIObjec
// -- MT
CStrW caption = (CStrW)Element.getText();
caption.Trim(PS_TRIM_BOTH);
if (caption.Length())
{
try