summaryrefslogtreecommitdiffstats
path: root/src/graphics/engine/text.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-26 16:31:04 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-26 16:31:04 +0200
commit45fd8aad33029746424031e12777f2824bda245e (patch)
tree7c984ec6bfda42c807ba48440f6d61fcef9056ef /src/graphics/engine/text.h
parentb06544871ae48871fc302706ecc49b78c6bcb3d2 (diff)
downloadcolobot-45fd8aad33029746424031e12777f2824bda245e.tar.gz
colobot-45fd8aad33029746424031e12777f2824bda245e.tar.bz2
colobot-45fd8aad33029746424031e12777f2824bda245e.zip
Fog color fix; refactoring
- fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText
Diffstat (limited to 'src/graphics/engine/text.h')
-rw-r--r--src/graphics/engine/text.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/graphics/engine/text.h b/src/graphics/engine/text.h
index 0ecf7cd..bb9a32d 100644
--- a/src/graphics/engine/text.h
+++ b/src/graphics/engine/text.h
@@ -293,11 +293,10 @@ protected:
float size, Math::Point pos, float width, int eol);
void DrawHighlight(FontHighlight hl, Math::Point pos, Math::Point size);
void DrawCharAndAdjustPos(UTF8Char ch, FontType font, float size, Math::Point &pos);
- std::vector<UTF8Char>
- StringToUTFCharList(const std::string &text);
+ void StringToUTFCharList(const std::string &text, std::vector<UTF8Char> &chars);
protected:
- CInstanceManager* m_iMan;
+ CInstanceManager* m_iMan;
CEngine* m_engine;
CDevice* m_device;
@@ -307,7 +306,7 @@ protected:
std::map<FontType, MultisizeFont*> m_fonts;
FontType m_lastFontType;
- int m_lastFontSize;
+ int m_lastFontSize;
CachedFont* m_lastCachedFont;
};