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

Remove unused header

Browse Source 
Also fix some spacing
This commit is contained in:
Benau 2015-11-08 01:36:40 +08:00
parent 09101e923c
commit 0b5a916980
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/guiengine/scalable_font.cpp
View File

@ -26,9 +26,7 @@
#include <IAttributes.h> #include <IAttributes.h>
#include <IGUIEnvironment.h> #include <IGUIEnvironment.h>
#include <IGUISpriteBank.h> #include <IGUISpriteBank.h>
#include <IReadFile.h>
#include <IVideoDriver.h> #include <IVideoDriver.h>
#include <IXMLReader.h>
#include <clocale> #include <clocale>
#include <cmath> #include <cmath>
@ -92,8 +90,10 @@ ScalableFont::~ScalableFont()
{ {
if (!m_is_hollow_copy) if (!m_is_hollow_copy)
{ {
if (m_video_driver) m_video_driver->drop(); if (m_video_driver)
if (m_spritebank) m_spritebank->drop(); m_video_driver->drop();
if (m_spritebank)
m_spritebank->drop();
} }
} }
@ -306,7 +306,7 @@ bool ScalableFont::loadTTF()
//Reserve 10 for normal font new characters added, 40 for digit font to display separately //Reserve 10 for normal font new characters added, 40 for digit font to display separately
//Consider fallback font (bold) too //Consider fallback font (bold) too
m_max_height = (int)((curr_maxheight + (m_type == T_DIGIT ? 40 : 10) + m_max_height = (int)((curr_maxheight + (m_type == T_DIGIT ? 40 : 10) +
(m_type == T_BOLD ? 20 : 0))*m_scale); (m_type == T_BOLD ? 20 : 0))*m_scale);
m_glyph_max_height = curr_maxheight; m_glyph_max_height = curr_maxheight;
@ -634,8 +634,7 @@ const ScalableFont::SFontArea &ScalableFont::getAreaFromCharacter(const wchar_t
{ {
const int area_id = getAreaIDFromCharacter(c, fallback_font); const int area_id = getAreaIDFromCharacter(c, fallback_font);
if (m_mono_space_digits && ((c>=L'0' && c<=L'9') || c==L' '))
if(m_mono_space_digits && ( (c>=L'0' && c<=L'9') || c==L' ' ) )
{ {
const SFontArea &area = (fallback_font && *fallback_font) const SFontArea &area = (fallback_font && *fallback_font)
? m_fallback_font->m_areas[area_id] ? m_fallback_font->m_areas[area_id]
@ -656,7 +655,7 @@ const ScalableFont::SFontArea &ScalableFont::getAreaFromCharacter(const wchar_t
} }
// Note: fallback_font can be NULL // Note: fallback_font can be NULL
return ( use_fallback_font ? m_fallback_font->m_areas[area_id] : m_areas[area_id]); return (use_fallback_font ? m_fallback_font->m_areas[area_id] : m_areas[area_id]);
} // getAreaFromCharacter } // getAreaFromCharacter
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------