summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-02 23:29:02 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-02 23:29:02 +0000
commit291ba43f690ebd5026476018dfd742819d07fb0f (patch)
treecf0daf9c4281c8ddeb14ce0e7e06c52e29e4243a /crawl-ref
parent79abc2a82db1bc1e941088c64bbad017e9f4a1cb (diff)
downloadcrawl-ref-291ba43f690ebd5026476018dfd742819d07fb0f.tar.gz
crawl-ref-291ba43f690ebd5026476018dfd742819d07fb0f.zip
[2467399] Improving Windows icon.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8141 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/dat/tiles/stone_soup_icon-16x16.pngbin426 -> 0 bytes
-rw-r--r--crawl-ref/source/dat/tiles/stone_soup_icon-win32.pngbin0 -> 496 bytes
-rw-r--r--crawl-ref/source/tilesdl.cc8
3 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/dat/tiles/stone_soup_icon-16x16.png b/crawl-ref/source/dat/tiles/stone_soup_icon-16x16.png
deleted file mode 100644
index 334ec2d3c7..0000000000
--- a/crawl-ref/source/dat/tiles/stone_soup_icon-16x16.png
+++ /dev/null
Binary files differ
diff --git a/crawl-ref/source/dat/tiles/stone_soup_icon-win32.png b/crawl-ref/source/dat/tiles/stone_soup_icon-win32.png
new file mode 100644
index 0000000000..666d536f43
--- /dev/null
+++ b/crawl-ref/source/dat/tiles/stone_soup_icon-win32.png
Binary files differ
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 1d16ea1cd6..3eeac75273 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -154,8 +154,12 @@ bool TilesFramework::initialise()
SDL_EnableUNICODE(true);
SDL_WM_SetCaption(CRAWL " " VERSION, CRAWL);
- // TODO enne - use a different icon on Windows, as this looks bad.
- SDL_Surface *icon = IMG_Load("dat/tiles/stone_soup_icon-32x32.png");
+#ifdef WIN32TILES
+ const char *icon_name = "dat/tiles/stone_soup_icon-win32.png";
+#else
+ const char *icon_name = "dat/tiles/stone_soup_icon-32x32.png";
+#endif
+ SDL_Surface *icon = IMG_Load(icon_name);
if (!icon)
{
printf("Failed to load icon: %s\n", SDL_GetError());