[Super-tux-commit] supertux/src setup.cpp,1.79,1.80 type.h,1.17,1.18

[Ryan F. <sik...@us...>]

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

Modified Files:
	setup.cpp type.h 
Log Message:
- added freedesktop.org .desktop file from Mike Hearn
- added supertux icons as supertux.xpm and supertux.png (old ones can be [re]moved)
- added TODO item

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- setup.cpp	10 May 2004 16:09:49 -0000	1.79
+++ setup.cpp	13 May 2004 23:16:46 -0000	1.80
@@ -895,13 +895,13 @@
 
   /* Load icon into a surface: */
 
-  icon = IMG_Load((datadir + "/images/icon.xpm").c_str());
+  icon = IMG_Load((datadir + "/images/supertux.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.xpm", SDL_GetError());
+              "%s\n\n", datadir.c_str(), "/images/supertux.xpm", SDL_GetError());
       exit(1);
     }
 

Index: type.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/type.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- type.h	7 May 2004 20:48:22 -0000	1.17
+++ type.h	13 May 2004 23:16:46 -0000	1.18
@@ -65,7 +65,8 @@
     scroll_x = tmp;
     base = btmp;
   };
-void move_to(float x, float y) { base.x = x; base.y = y; };
+
+  void move_to(float x, float y) { base.x = x; base.y = y; };
 
   base_type base;
   base_type old_base;