From 3c0abe55d70e46ec61bf5c9349160c52d46c84f9 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 26 Apr 2008 14:33:14 +0000 Subject: Add new Chocolate Doom icon. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1129 --- data/README | 5 + data/doom.ico | Bin 3638 -> 2238 bytes data/doom.png | Bin 1369 -> 7332 bytes data/setup.ico | Bin 6518 -> 2238 bytes data/setup.png | Bin 620 -> 7397 bytes setup/Makefile.am | 2 +- setup/mainmenu.c | 21 ++- setup/setup_icon.c | 512 ++++++++++++++++++++++++++--------------------------- src/icon.c | 422 +++++++++++++++++++++---------------------- 9 files changed, 493 insertions(+), 469 deletions(-) create mode 100644 data/README diff --git a/data/README b/data/README new file mode 100644 index 00000000..8b927335 --- /dev/null +++ b/data/README @@ -0,0 +1,5 @@ +The Chocolate Doom icon is based on an image by Chris Metcalf +(http://www.chrismetcalf.org/) which is copyrighted to him: + + http://www.flickr.com/photos/laffy4k/448920776/ + diff --git a/data/doom.ico b/data/doom.ico index 602d32d4..f55ff28f 100644 Binary files a/data/doom.ico and b/data/doom.ico differ diff --git a/data/doom.png b/data/doom.png index 6d58b874..d75a8f23 100644 Binary files a/data/doom.png and b/data/doom.png differ diff --git a/data/setup.ico b/data/setup.ico index 32a0b761..6d734a11 100644 Binary files a/data/setup.ico and b/data/setup.ico differ diff --git a/data/setup.png b/data/setup.png index 152999d3..1491e244 100644 Binary files a/data/setup.png and b/data/setup.png differ diff --git a/setup/Makefile.am b/setup/Makefile.am index 670d8cde..c6d5270e 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -38,7 +38,7 @@ endif if HAVE_PYTHON -setup_icon.c : ../data/setup.png +setup_icon.c : ../data/setup.ico ../data/convert-icon $^ $@ endif diff --git a/setup/mainmenu.c b/setup/mainmenu.c index 4ff5b449..d4dfe0db 100644 --- a/setup/mainmenu.c +++ b/setup/mainmenu.c @@ -151,6 +151,24 @@ static void InitConfig(void) static void SetIcon(void) { SDL_Surface *surface; + Uint8 *mask; + int i; + + // Generate the mask + + mask = malloc(setup_icon_w * setup_icon_h / 8); + memset(mask, 0, setup_icon_w * setup_icon_h / 8); + + for (i=0; i