diff options
| author | Simon <simon@hardwired.org.uk> | 2010-09-02 23:06:18 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2010-09-02 23:06:18 (GMT) |
| commit | 274383105a675af4235c250e7c0690a86e71a8c0 (patch) | |
| tree | 79801fe8b463163591f87804f4bfbd8c41f0d3fc /main.c | |
| parent | 32b1a2c3ab928bec980601f257487db39b0b8e33 (diff) | |
| download | powder-274383105a675af4235c250e7c0690a86e71a8c0.zip powder-274383105a675af4235c250e7c0690a86e71a8c0.tar.gz | |
Revert "does not compile at the moment, cause unknown, also. always use // for one line comments"
This reverts commit 32b1a2c3ab928bec980601f257487db39b0b8e33.
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -49,7 +49,7 @@ #include "hmap.h" #include "air.h" -static const char *it_msg = +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 = 0, mousey = 0; //They contain mouse position +int mousex, mousey = 0; //They contain mouse position void sdl_seticon(void) { @@ -140,12 +140,10 @@ 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*/); -/* Does currently not work #else +#else SDL_Surface *icon = SDL_CreateRGBSurfaceFrom(app_icon, 16, 16, 32, 128, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000); - SDL_WM_SetIcon(icon, NULLapp_icon_mask)//app_icon mask; -*/ + SDL_WM_SetIcon(icon, NULL/*app_icon_mask*/); #endif - #endif } |
