diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-15 20:09:19 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-15 20:09:19 +0000 |
| commit | 141a6b8304cb7a55cad08cd1de379e43ca83b38b (patch) | |
| tree | 56a1e039e771a49242d2c3ae3a3c4e3ceecb598f /crawl-ref/source/tilesdl.cc | |
| parent | ceb4c8964c99e64f6adebad119e1bbbafafedd62 (diff) | |
| download | crawl-ref-141a6b8304cb7a55cad08cd1de379e43ca83b38b.tar.gz crawl-ref-141a6b8304cb7a55cad08cd1de379e43ca83b38b.zip | |
Apply my recent commits to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9984 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilesdl.cc')
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index e112c7cc34..9ba2f854df 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -351,8 +351,6 @@ bool TilesFramework::initialise() int TilesFramework::load_font(const char *font_file, int font_size, bool default_on_fail, bool outline) { - FTFont *font = new FTFont(); - for (unsigned int i = 0; i < m_fonts.size(); i++) { font_info &finfo = m_fonts[i]; @@ -363,6 +361,8 @@ int TilesFramework::load_font(const char *font_file, int font_size, } } + FTFont *font = new FTFont(); + if (!font->load_font(font_file, font_size, outline)) { delete font; @@ -373,9 +373,9 @@ int TilesFramework::load_font(const char *font_file, int font_size, } font_info finfo; + finfo.font = font; finfo.name = font_file; finfo.size = font_size; - finfo.font = font; finfo.outline = outline; m_fonts.push_back(finfo); @@ -744,7 +744,7 @@ int TilesFramework::getch_ck() int key = 0; - const unsigned int ticks_per_redraw = 50; + const unsigned int ticks_per_redraw = 80; unsigned int last_redraw_tick = 0; unsigned int res = Options.tile_tooltip_ms; |