[Super-tux-commit] supertux/src background.cpp,1.9,1.10 defines.h,1.45,1.46 special.cpp,1.60,1.61

[Duong-Khang N. <neo...@us...>]

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

Modified Files:
	background.cpp defines.h special.cpp 
Log Message:
added CONFIG_HEADER and fixed minorest bugs :)

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- defines.h	9 Jun 2004 05:23:20 -0000	1.45
+++ defines.h	13 Jun 2004 21:48:16 -0000	1.46
@@ -20,7 +20,9 @@
 //  02111-1307, USA.
 
 #ifndef SUPERTUX_DEFINES_H
-#define SUPERTUX_DEFINES_H
+#define SUPERTUX_DEFINES_H 1
+
+#include <config.h>
 
 /* Version: */
 

Index: background.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- background.cpp	12 Jun 2004 15:48:50 -0000	1.9
+++ background.cpp	13 Jun 2004 21:48:16 -0000	1.10
@@ -39,7 +39,7 @@
   int tr, tg, tb, br, bg, bb;
   if(reader.read_int("top_red", tr) && reader.read_int("top_green", tg)
       && reader.read_int("top_blue", tb) && reader.read_int("bottom_red", br)
-      && reader.read_int("bottom_green", br)
+      && reader.read_int("bottom_green", bg)
       && reader.read_int("bottom_blue", bb)) {
     set_gradient(Color(tr, tg, tb), Color(br, bg, bb));
   }

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- special.cpp	12 Jun 2004 21:13:34 -0000	1.60
+++ special.cpp	13 Jun 2004 21:48:16 -0000	1.61
@@ -263,6 +263,7 @@
     case UPGRADE_1UP: sprite = img_1up; break;
     default:
       assert(!"wrong type in Powerup::draw()");
+      sprite = NULL;		// added by neoneurone, g++ likes this !
   }
 
   if(base.height < 32) // still raising up?