update

SVN-Revision: 105

diff --git a/CHANGES.txt b/CHANGES.txt
index a1aecaa..d831b85 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,46 @@ http://www.newbreedsoftware.com/supertux/
 
 0.0.6 - current CVS version
 ---------------------------
+  * Added optional backgrounds for levels.
+    Tobias Glaesser <tobi.web@gmx.de>
+    
+  * First code to optimize the FPS. The maximum are 100 FPS.
+    Tobias Glaesser <tobi.web@gmx.de>    
+
+  * Introduced command line option --show-fps. It's self-describing. :)
+    Tobias Glaesser <tobi.web@gmx.de>
+
+  * Text is displayed correctly in OpenGL mode now.
+    Tobias Glaesser <tobi.web@gmx.de>
+  
+  * Alpha works in OpenGL mode now.
+    Tobias Glaesser <tobi.web@gmx.de>
+        
+  * Rewrite of text/font related code, which should bring huge performance increases to you.
+    Tobias Glaesser <tobi.web@gmx.de>    
+
+  * Added a highscore background and improved the name input code.
+    Tobias Glaesser <tobi.web@gmx.de>
+        
+  * Added feature to enter your name for a new highscore. 
+    Ricardo Cruz <rick2@aeiou.pt>
+        
+  * Grid support for the leveleditor and you can look
+    what's inside a brick now.
+    Ricardo Cruz <rick2@aeiou.pt>    
+
+  * Initial infrastructure for mapping keys.
+    Tobias Glaesser <tobi.web@gmx.de> & Ricardo Cruz <rick2@aeiou.pt>
+
+  * Fixed a little displaying bug of upgrades.
+    Ricardo Cruz <rick2@aeiou.pt> 
+    
+  * Improved and fixed the sound support another time.
+    Duong-Khang NGUYEN <neoneurone@users.sf.net>    
+    
+  * Fixed uncorrect use of TIME_WARNING.
+    Duong-Khang NGUYEN <neoneurone@users.sf.net>    
+
   * Provided hint for fixing memory leak when fullscreen is toggled.
     Ricardo Cruz <rick2@aeiou.pt> 
     

diff --git a/Makefile b/Makefile
index 3a5c5ae..534e66b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ JOY=YES
 
 #undefine this for non debugging compilation
 
-DEBUG_FLAG=-DDEBUG
+DEBUG_FLAG=-DDEBUG -pg
 
 # Defaults for Linux:
 
@@ -53,7 +53,7 @@ installdat = install -g $(USERNAME) -o $(USERNAME) -m 644
 
 
 OBJECTS=obj/supertux.o obj/setup.o obj/intro.o obj/title.o obj/scene.o obj/collision.o obj/bitmask.o obj/type.o \
-       obj/timer.o obj/texture.o obj/badguy.o obj/special.o  obj/world.o obj/player.o obj/level.o obj/gameloop.o \
+       obj/timer.o obj/text.o obj/texture.o obj/badguy.o obj/special.o  obj/world.o obj/player.o obj/level.o obj/gameloop.o \
        obj/screen.o obj/sound.o obj/high_scores.o obj/menu.o obj/leveleditor.o
 
 # Make commands:
@@ -153,6 +153,11 @@ obj/texture.o:     src/texture.c src/texture.h \
                src/setup.h obj/level.o
        $(CC) $(CFLAGS) src/texture.c -c -o obj/texture.o
 
+obj/text.o:    src/text.c src/text.h \
+               src/defines.h src/globals.h src/screen.h src/scene.h src/gameloop.h obj/sound.o \
+               src/setup.h obj/level.o
+       $(CC) $(CFLAGS) src/text.c -c -o obj/text.o
+       
 obj/badguy.o:  src/badguy.c src/badguy.h \
                src/defines.h src/globals.h src/screen.h src/gameloop.h obj/sound.o \
                src/setup.h obj/level.o