diff options
| author | oy <Tom_Adams@web.de> | 2010-07-17 14:10:43 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-07-17 14:10:43 +0200 |
| commit | 6193f354232b3cc9a7272c3b17cfc52b6415c9b8 (patch) | |
| tree | 1b1b8bd1698240391ad89923edf33899a1046237 /src/engine | |
| parent | 052820dc888a0912fd2ff413389bc24b1cfbf08d (diff) | |
| parent | a8acf8c6ff3af78369a0194b7f3ee34b5ab9df5c (diff) | |
| download | zcatch-6193f354232b3cc9a7272c3b17cfc52b6415c9b8.tar.gz zcatch-6193f354232b3cc9a7272c3b17cfc52b6415c9b8.zip | |
Merge branch 'master' of http://github.com/matricks/teeworlds
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/client/text.cpp | 7 | ||||
| -rw-r--r-- | src/engine/textrender.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/client/text.cpp b/src/engine/client/text.cpp index 8fa8efee..672fde60 100644 --- a/src/engine/client/text.cpp +++ b/src/engine/client/text.cpp @@ -67,8 +67,9 @@ struct CFontSizeData int m_CurrentCharacter; }; -struct CFont +class CFont { +public: char m_aFilename[128]; FT_Face m_FtFace; CFontSizeData m_aSizes[NUM_FONT_SIZES]; @@ -101,7 +102,7 @@ class CTextRender : public IEngineTextRender int m_FontTextureFormat; - struct CFont *m_pDefaultFont; + CFont *m_pDefaultFont; FT_Library m_FTLibrary; @@ -470,7 +471,7 @@ public: mem_free(pFont); } - virtual void SetDefaultFont(struct CFont *pFont) + virtual void SetDefaultFont(CFont *pFont) { dbg_msg("textrender", "default pFont set %p", pFont); m_pDefaultFont = pFont; diff --git a/src/engine/textrender.h b/src/engine/textrender.h index 7c7e036b..38dd5d86 100644 --- a/src/engine/textrender.h +++ b/src/engine/textrender.h @@ -23,7 +23,7 @@ public: float m_LineWidth; float m_X, m_Y; - struct CFont *m_pFont; + CFont *m_pFont; float m_FontSize; }; @@ -36,7 +36,7 @@ public: virtual CFont *LoadFont(const char *pFilename) = 0; virtual void DestroyFont(CFont *pFont) = 0; - virtual void SetDefaultFont(struct CFont *pFont) = 0; + virtual void SetDefaultFont(CFont *pFont) = 0; // virtual void TextEx(CTextCursor *pCursor, const char *pText, int Length) = 0; |