summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-03-22 16:41:10 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-03-22 16:41:10 +0000
commitf6bd7da487f163d8ce6fa6975229715f11e1c3bb (patch)
tree3a2f4985865275aa84a2892b06f808f44b96279c /src
parentc1e091c761ca5f673831d4547db80b1ba1c59399 (diff)
downloadmana-f6bd7da487f163d8ce6fa6975229715f11e1c3bb.tar.gz
mana-f6bd7da487f163d8ce6fa6975229715f11e1c3bb.tar.bz2
mana-f6bd7da487f163d8ce6fa6975229715f11e1c3bb.tar.xz
mana-f6bd7da487f163d8ce6fa6975229715f11e1c3bb.zip
Use the icon included in the executable on Windows.
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 810dc758..98a7aeb7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -81,6 +81,10 @@
#include "utils/dtor.h"
#include "utils/tostring.h"
+#ifdef WIN32
+#include <SDL_syswm.h>
+#endif
+
// Account infos
char n_server, n_character;
@@ -257,9 +261,16 @@ void init_engine(const Options &options)
}
SDL_WM_SetCaption("The Mana World", NULL);
- SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw-32x32.png");
+#ifdef WIN32
+ static SDL_SysWMinfo pInfo;
+ SDL_GetWMInfo(&pInfo);
+ HICON icon = LoadIcon(GetModuleHandle(NULL), "A");
+ SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
+#else
+ SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png");
SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
SDL_WM_SetIcon(icon, NULL);
+#endif
#ifdef USE_OPENGL
bool useOpenGL = (config.getValue("opengl", 0) == 1);