[Super-tux-commit] supertux/src setup.cpp,1.47,1.48

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25096/src

Modified Files:
	setup.cpp 
Log Message:
Changed icon.png to icon.xpm. This way we don't have to worry about masks.
But not sure if it works well under windows (someone give a try).
Anyway, I just comment the old code, so we can reverse this any time.

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- setup.cpp	21 Apr 2004 23:38:03 -0000	1.47
+++ setup.cpp	22 Apr 2004 11:26:39 -0000	1.48
@@ -855,39 +855,39 @@
 
 void seticon(void)
 {
-  int masklen;
-  Uint8 * mask;
+//  int masklen;
+//  Uint8 * mask;
   SDL_Surface * icon;
 
 
   /* Load icon into a surface: */
 
-  icon = IMG_Load((datadir + "/images/icon.png").c_str());
+  icon = IMG_Load((datadir + "/images/icon.xpm").c_str());
   if (icon == NULL)
     {
       fprintf(stderr,
               "\nError: I could not load the icon image: %s%s\n"
               "The Simple DirectMedia error that occured was:\n"
-              "%s\n\n", datadir.c_str(), "/images/icon.png", SDL_GetError());
+              "%s\n\n", datadir.c_str(), "/images/icon.xpm", SDL_GetError());
       exit(1);
     }
 
 
   /* Create mask: */
-
+/*
   masklen = (((icon -> w) + 7) / 8) * (icon -> h);
   mask = (Uint8*) malloc(masklen * sizeof(Uint8));
   memset(mask, 0xFF, masklen);
-
+*/
 
   /* Set icon: */
 
-  SDL_WM_SetIcon(icon, mask);
+  SDL_WM_SetIcon(icon, NULL);//mask);
 
 
   /* Free icon surface & mask: */
 
-  free(mask);
+//  free(mask);
   SDL_FreeSurface(icon);
 }