diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-21 17:53:49 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-21 17:53:49 +0000 |
| commit | 41f78a696154902ae7baa22e116d39b6d321fc62 (patch) | |
| tree | 3cb6f681c0124314d7293c90ea242ce2f5385ed5 /crawl-ref/source/tilesdl.cc | |
| parent | a17368df4fcbdf37e3452c6bc4935ba4372aabd8 (diff) | |
| download | crawl-ref-41f78a696154902ae7baa22e116d39b6d321fc62.tar.gz crawl-ref-41f78a696154902ae7baa22e116d39b6d321fc62.zip | |
Make fish on dry land (due to Feawn's Sunlight power) flop about and
lose hit points until back in water, using ENCH_AQUATIC_LAND. (Bug 2824663)
Also fix tiles compilation (patch 2824632) and add DATA_DIR_PATH to tiled
icons (patch 2824635). Both patches (and some more) by Trent W. Buck.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10364 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilesdl.cc')
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 11bdc6b964..c84fcd9c30 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -232,11 +232,16 @@ bool TilesFramework::initialise() SDL_EnableUNICODE(true); SDL_WM_SetCaption(CRAWL " " VERSION, CRAWL); + const char *icon_name = +#ifdef DATA_DIR_PATH + DATA_DIR_PATH +#endif #ifdef WIN32TILES - const char *icon_name = "dat/tiles/stone_soup_icon-win32.png"; + "dat/tiles/stone_soup_icon-win32.png"; #else - const char *icon_name = "dat/tiles/stone_soup_icon-32x32.png"; + "dat/tiles/stone_soup_icon-32x32.png"; #endif + SDL_Surface *icon = IMG_Load(icon_name); if (!icon) { |