diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-15 19:08:27 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-15 19:08:27 +0000 |
| commit | d43e71a2423bb56d0ffe71d14093414e57e89ecb (patch) | |
| tree | fc72b74a2bc13f73c6e3f83087ad778b26c884d8 /crawl-ref/source/tilesdl.cc | |
| parent | 5932620bfc39a9386d253378c4550cd4aca344b6 (diff) | |
| download | crawl-ref-d43e71a2423bb56d0ffe71d14093414e57e89ecb.tar.gz crawl-ref-d43e71a2423bb56d0ffe71d14093414e57e89ecb.zip | |
Plug a couple of memory holes. Unfortunately, between libSDL and
libfreetype there's loads of leakage that I can't do anything about.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9983 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilesdl.cc')
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index f7f29e5bc9..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); |