[Super-tux-commit] supertux/src badguy.h,1.59,1.60 camera.cpp,1.13,1.14 camera.h,1.10,1.11 collision.h,1.18,1.19 door.cpp,1.6,1.7 door.h,1.6,1.7 gameloop.h,1.54,1.55 gameobjs.h,1.30,1.31 high_scores.cpp,1.23,1.24 interactive_object.h,1.4,1.5 intro.cpp,1.28,1.29 level.h,1.61,1.62 level_subset.cpp,1.4,1.5 level_subset.h,1.3,1.4 misc.cpp,1.1,1.2 particlesystem.h,1.11,1.12 player.h,1.75,1.76 resources.cpp,1.42,1.43 resources.h,1.12,1.13 sector.h,1.8,1.9 serializable.h,1.3,1.4 tile.h,1.31,1.32 tilemap.h,1.12,1.13

[Tobias G. <to...@us...>]

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

Modified Files:
	badguy.h camera.cpp camera.h collision.h door.cpp door.h 
	gameloop.h gameobjs.h high_scores.cpp interactive_object.h 
	intro.cpp level.h level_subset.cpp level_subset.h misc.cpp 
	particlesystem.h player.h resources.cpp resources.h sector.h 
	serializable.h tile.h tilemap.h 
Log Message:
The SuperTux library features a SuperTux namespace now.
+ minor Bugfixes and cleanups

Index: resources.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- resources.h	20 Jul 2004 18:04:48 -0000	1.12
+++ resources.h	21 Jul 2004 16:51:53 -0000	1.13
@@ -21,9 +21,14 @@
 #define SUPERTUX_RESOURCES_H
 
 #include "audio/musicref.h"
+#include "gui/menu.h"
+
+using namespace SuperTux;
 
+namespace SuperTux {
 class SpriteManager;
 class SoundManager;
+}
 
 /* Sound files: */
 enum {
@@ -66,6 +71,17 @@
 extern SpriteManager* sprite_manager;
 extern SoundManager* sound_manager;
 
+extern Menu* contrib_menu;
+extern Menu* contrib_subset_menu;
+extern Menu* main_menu;
+extern Menu* game_menu;
+extern Menu* options_menu;
+extern Menu* options_keys_menu;
+extern Menu* options_joystick_menu;
+extern Menu* highscore_menu;
+extern Menu* load_game_menu;
+extern Menu* save_game_menu;
+
 void loadshared();
 void unloadshared();
 

Index: misc.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/misc.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- misc.cpp	20 Jul 2004 17:59:37 -0000	1.1
+++ misc.cpp	21 Jul 2004 16:51:53 -0000	1.2
@@ -189,7 +189,18 @@
   highscore_menu->additem(MN_TEXTFIELD,_("Enter your name:"),0,0);
 }
 
+/* Free menus */
 void st_menu_free()
 {
   delete worldmap_menu;
+  delete main_menu;
+  delete game_menu;
+  delete options_menu;
+  delete options_keys_menu;
+  delete options_joystick_menu;
+  delete highscore_menu;
+  delete contrib_menu;
+  delete contrib_subset_menu;
+  delete save_game_menu;
+  delete load_game_menu;
 }

Index: level_subset.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level_subset.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- level_subset.cpp	20 Jul 2004 18:04:48 -0000	1.4
+++ level_subset.cpp	21 Jul 2004 16:51:53 -0000	1.5
@@ -25,6 +25,8 @@
 #include "video/surface.h"
 #include "level_subset.h"
 
+using namespace SuperTux;
+
 static bool has_suffix(const std::string& data, const std::string& suffix)
 {
   if (data.length() >= suffix.length())

Index: collision.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/collision.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- collision.h	20 Jul 2004 18:04:47 -0000	1.18
+++ collision.h	21 Jul 2004 16:51:53 -0000	1.19
@@ -23,6 +23,8 @@
 
 #include "special/base.h"
 
+using namespace SuperTux;
+
 class Tile;
 
 /* Collision objects */

Index: sector.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sector.h	20 Jul 2004 18:04:48 -0000	1.8
+++ sector.h	21 Jul 2004 16:51:53 -0000	1.9
@@ -29,7 +29,13 @@
 #include "audio/musicref.h"
 #include "video/drawing_context.h"
 
+using namespace SuperTux;
+
+namespace SuperTux {
 class GameObject;
+class LispReader;
+}
+
 class InteractiveObject;
 class Background;
 class Player;
@@ -40,8 +46,6 @@
 class Upgrade;
 class Bullet;
 class BadGuy;
-class Vector;
-class LispReader;
 class Tile;
 
 struct SpawnPoint

Index: badguy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- badguy.h	20 Jul 2004 18:04:47 -0000	1.59
+++ badguy.h	21 Jul 2004 16:51:53 -0000	1.60
@@ -35,6 +35,8 @@
 #include "serializable.h"
 #include "scene.h"
 
+using namespace SuperTux;
+
 /* Timing constants (in ms): */
 
 #define KICKING_TIME 200

Index: gameloop.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- gameloop.h	20 Jul 2004 18:04:47 -0000	1.54
+++ gameloop.h	21 Jul 2004 16:51:53 -0000	1.55
@@ -26,6 +26,8 @@
 #include "audio/sound.h"
 #include "special/base.h"
 
+using namespace SuperTux;
+
 /* GameLoop modes */
 
 #define ST_GL_PLAY 0
@@ -34,7 +36,6 @@
 #define ST_GL_LOAD_LEVEL_FILE  3
 #define ST_GL_DEMO_GAME  4
 
-
 enum GameMenuIDs {
   MNID_CONTINUE,
   MNID_ABORTLEVEL
@@ -44,7 +45,10 @@
 
 class Level;
 class Sector;
+
+namespace SuperTux {
 class DrawingContext;
+}
 
 /** The GameSession class controlls the controll flow of a World, ie.
     present the menu on specifc keypresses, render and update it while

Index: door.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/door.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- door.cpp	20 Jul 2004 18:04:47 -0000	1.6
+++ door.cpp	21 Jul 2004 16:51:53 -0000	1.7
@@ -27,6 +27,8 @@
 #include "video/drawing_context.h"
 #include "app/globals.h"
 
+using namespace SuperTux;
+
 /** data images */
 Sprite* door;
 Surface* door_opening[DOOR_OPENING_FRAMES];

Index: camera.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/camera.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- camera.cpp	20 Jul 2004 18:04:47 -0000	1.13
+++ camera.cpp	21 Jul 2004 16:51:53 -0000	1.14
@@ -29,6 +29,8 @@
 #include "app/globals.h"
 #include "sector.h"
 
+using namespace SuperTux;
+
 Camera::Camera(Sector* newsector)
   : sector(newsector), do_backscrolling(true), scrollchange(NONE),
     auto_idx(0), auto_t(0)

Index: high_scores.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/high_scores.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- high_scores.cpp	20 Jul 2004 18:04:47 -0000	1.23
+++ high_scores.cpp	21 Jul 2004 16:51:53 -0000	1.24
@@ -31,6 +31,9 @@
 #include "video/surface.h"
 #include "app/setup.h"
 #include "utils/lispreader.h"
+#include "resources.h"
+
+using namespace SuperTux;
 
 #ifdef WIN32
 const char * highscore_filename = "/st_highscore.dat";

Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- resources.cpp	20 Jul 2004 18:04:48 -0000	1.42
+++ resources.cpp	21 Jul 2004 16:51:53 -0000	1.43
@@ -37,6 +37,17 @@
 Surface* img_cloud[2][4];
 Surface* img_distro[4];
 
+Menu* main_menu      = 0;
+Menu* game_menu      = 0;
+Menu* options_menu   = 0;
+Menu* options_keys_menu     = 0;
+Menu* options_joystick_menu = 0;
+Menu* highscore_menu = 0;
+Menu* load_game_menu = 0;
+Menu* save_game_menu = 0;
+Menu* contrib_menu   = 0;
+Menu* contrib_subset_menu   = 0;
+
 MusicRef herring_song;
 MusicRef level_end_song;
 

Index: tile.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- tile.h	20 Jul 2004 18:04:48 -0000	1.31
+++ tile.h	21 Jul 2004 16:51:53 -0000	1.32
@@ -25,8 +25,11 @@
 #include "SDL.h"
 #include "video/surface.h"
 
-class Vector;
+using namespace SuperTux;
+
+namespace SuperTux {
 class LispReader;
+}
 
 /**
 Tile Class

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- player.h	20 Jul 2004 18:04:48 -0000	1.75
+++ player.h	21 Jul 2004 16:51:53 -0000	1.76
@@ -32,6 +32,8 @@
 #include "math/physic.h"
 #include "app/defines.h"
 
+using namespace SuperTux;
+
 class BadGuy;
 
 /* Times: */
@@ -86,7 +88,9 @@
 
 void player_input_init(player_input_type* pplayer_input);
 
+namespace SuperTux {
 class Sprite;
+}
 class Camera;
 
 extern Surface* tux_life;

Index: door.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/door.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- door.h	20 Jul 2004 18:04:47 -0000	1.6
+++ door.h	21 Jul 2004 16:51:53 -0000	1.7
@@ -27,9 +27,10 @@
 #include "serializable.h"
 #include "special/timer.h"
 
+namespace SuperTux {
 class Sprite;
-
 class LispReader;
+}
 
 /** data images */
 #define DOOR_OPENING_TIME 1500

Index: level_subset.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level_subset.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- level_subset.h	20 Jul 2004 18:04:48 -0000	1.3
+++ level_subset.h	21 Jul 2004 16:51:53 -0000	1.4
@@ -25,7 +25,11 @@
 #include <string>
 #include "utils/lispreader.h"
 
+using namespace SuperTux;
+
+namespace SuperTux {
 class Surface;
+};
 
 /** This type holds meta-information about a level-subset. 
     It could be extended to handle manipulation of subsets. */

Index: gameobjs.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- gameobjs.h	20 Jul 2004 18:04:47 -0000	1.30
+++ gameobjs.h	21 Jul 2004 16:51:53 -0000	1.31
@@ -37,7 +37,9 @@
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
+namespace SuperTux {
 class Sprite;
+}
 
 struct TileId;
 

Index: tilemap.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tilemap.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tilemap.h	20 Jul 2004 18:04:48 -0000	1.12
+++ tilemap.h	21 Jul 2004 16:51:53 -0000	1.13
@@ -26,9 +26,14 @@
 #include "serializable.h"
 #include "math/vector.h"
 
+using namespace SuperTux;
+
+namespace SuperTux {
+class LispReader;
+}
+
 class Level;
 class TileManager;
-class LispReader;
 class Tile;
 
 struct TileId

Index: particlesystem.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/particlesystem.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- particlesystem.h	20 Jul 2004 18:04:48 -0000	1.11
+++ particlesystem.h	21 Jul 2004 16:51:53 -0000	1.12
@@ -26,7 +26,12 @@
 #include "special/game_object.h"
 #include "serializable.h"
 
+using namespace SuperTux;
+
+namespace SuperTux {
 class LispReader;
+}
+
 class DisplayManager;
 
 /**

Index: serializable.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/serializable.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serializable.h	9 Jun 2004 05:23:20 -0000	1.3
+++ serializable.h	21 Jul 2004 16:51:53 -0000	1.4
@@ -20,7 +20,11 @@
 #ifndef SUPERTUX_SERIALIZABLE_H
 #define SUPERTUX_SERIALIZABLE_H
 
+using namespace SuperTux;
+
+namespace SuperTux {
 class LispWriter;
+}
 
 class Serializable
 {

Index: camera.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/camera.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- camera.h	20 Jul 2004 18:04:47 -0000	1.10
+++ camera.h	21 Jul 2004 16:51:53 -0000	1.11
@@ -26,9 +26,15 @@
 #include "app/defines.h"
 #include "math/vector.h"
 #include "special/game_object.h"
+#include "video/drawing_context.h"
 #include "serializable.h"
 
+using namespace SuperTux;
+
+namespace SuperTux {
 class LispReader;
+}
+
 class Sector;
 
 class Camera : public GameObject, public Serializable

Index: interactive_object.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/interactive_object.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- interactive_object.h	20 Jul 2004 18:04:47 -0000	1.4
+++ interactive_object.h	21 Jul 2004 16:51:53 -0000	1.5
@@ -23,6 +23,8 @@
 #include "special/game_object.h"
 #include "special/base.h"
 
+using namespace SuperTux;
+
 enum InteractionType
 {
   INTERACTION_TOUCH, INTERACTION_ACTIVATE // more to come

Index: intro.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/intro.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- intro.cpp	20 Jul 2004 18:04:47 -0000	1.28
+++ intro.cpp	21 Jul 2004 16:51:53 -0000	1.29
@@ -23,6 +23,8 @@
 #include "video/font.h"
 #include "video/screen.h"
 
+using namespace SuperTux;
+
 void draw_intro()
 {
   display_text_file("intro.txt", 1);

Index: level.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- level.h	7 Jul 2004 17:56:01 -0000	1.61
+++ level.h	21 Jul 2004 16:51:53 -0000	1.62
@@ -24,8 +24,13 @@
 #include <map>
 #include <string>
 
+using namespace SuperTux;
+
 class Sector;
+
+namespace SuperTux {
 class LispReader;
+}
 
 class Level
 {