summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorFelix Wallin <nibbler.v1@gmail.com>2010-09-02 20:59:48 (GMT)
committer Felix Wallin <nibbler.v1@gmail.com>2010-09-02 20:59:48 (GMT)
commit32b1a2c3ab928bec980601f257487db39b0b8e33 (patch)
treecf699c673188c45ae2061a2f0f6952af72668c74 /main.c
parent5c0ffc799bd2cb5d8596904df5be124b2f52a387 (diff)
downloadpowder-32b1a2c3ab928bec980601f257487db39b0b8e33.zip
powder-32b1a2c3ab928bec980601f257487db39b0b8e33.tar.gz
does not compile at the moment, cause unknown, also. always use // for one line comments
Diffstat (limited to 'main.c')
-rw-r--r--main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/main.c b/main.c
index 9b9b4d2..5fc9ac1 100644
--- a/main.c
+++ b/main.c
@@ -49,7 +49,7 @@
#include "hmap.h"
#include "air.h"
-char *it_msg =
+static const char *it_msg =
"\brThe Powder Toy\n"
"\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n"
"\n"
@@ -129,7 +129,7 @@ int core_count()
return numCPU;
}
-int mousex, mousey = 0; //They contain mouse position
+int mousex = 0, mousey = 0; //They contain mouse position
void sdl_seticon(void)
{
@@ -140,10 +140,12 @@ void sdl_seticon(void)
#ifdef MACOSX
//SDL_Surface *icon = SDL_CreateRGBSurfaceFrom(app_icon_w32, 32, 32, 32, 128, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000);
//SDL_WM_SetIcon(icon, NULL/*app_icon_mask*/);
-#else
+/* Does currently not work #else
SDL_Surface *icon = SDL_CreateRGBSurfaceFrom(app_icon, 16, 16, 32, 128, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000);
- SDL_WM_SetIcon(icon, NULL/*app_icon_mask*/);
+ SDL_WM_SetIcon(icon, NULLapp_icon_mask)//app_icon mask;
+*/
#endif
+
#endif
}