diff options
| author | Ixtli <cg@325i.org> | 2010-04-22 21:57:00 +0900 |
|---|---|---|
| committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 10:19:49 -0400 |
| commit | 61b6ffc62470f761f101466672dda3bcc55951ae (patch) | |
| tree | 91297676c9242f3a7c1f7b610ecb6f7e63f4aaa2 /crawl-ref/source/tilesdl.h | |
| parent | fc49ef72ebbf562112138b0a18659a016111977b (diff) | |
| download | crawl-ref-61b6ffc62470f761f101466672dda3bcc55951ae.tar.gz crawl-ref-61b6ffc62470f761f101466672dda3bcc55951ae.zip | |
Brought merge changes in line with iPad branch
Diffstat (limited to 'crawl-ref/source/tilesdl.h')
| -rw-r--r-- | crawl-ref/source/tilesdl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/tilesdl.h b/crawl-ref/source/tilesdl.h index 2f2cf19729..f53daea052 100644 --- a/crawl-ref/source/tilesdl.h +++ b/crawl-ref/source/tilesdl.h @@ -109,9 +109,9 @@ public: MenuRegion *get_menu() { return m_region_menu; } bool is_fullscreen() { return m_fullscreen; } - FTFont* get_crt_font() { return m_fonts.at(m_crt_font).font; } + FontWrapper* get_crt_font() { return m_fonts.at(m_crt_font).font; } CRTRegion* get_crt() { return m_region_crt; } - const ImageManager& get_image_manager() { return m_image; } + const ImageManager* get_image_manager() { return m_image; } protected: int load_font(const char *font_file, int font_size, bool default_on_fail, bool outline); |