Added supertux/globals.?pp to collect all the random global variables

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6027 837edb03-e0f3-0310-88ca-d4d4e8b29345

diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 937bf6c..7a57620 100644 (file)
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -16,7 +16,7 @@
 
 #include "gui/button.hpp"
 
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 Font* Button::info_font = 0;

diff --git a/src/gui/button_group.cpp b/src/gui/button_group.cpp
index 0e910e9..00e37b5 100644 (file)
--- a/src/gui/button_group.cpp
+++ b/src/gui/button_group.cpp
@@ -16,7 +16,7 @@
 
 #include "gui/button_group.hpp"
 
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 extern SDL_Surface* g_screen;

diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index d92fff9..77fa403 100644 (file)
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -21,7 +21,7 @@
 #include "control/joystickkeyboardcontroller.hpp"
 #include "gui/menu_item.hpp"
 #include "gui/mousecursor.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/timer.hpp"

diff --git a/src/gui/mousecursor.cpp b/src/gui/mousecursor.cpp
index 7723b36..b40a111 100644 (file)
--- a/src/gui/mousecursor.cpp
+++ b/src/gui/mousecursor.cpp
@@ -18,7 +18,7 @@
 
 #include <SDL.h>
 
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 MouseCursor* MouseCursor::current_ = 0;

diff --git a/src/object/background.cpp b/src/object/background.cpp
index 1c3a9b9..619645b 100644 (file)
--- a/src/object/background.cpp
+++ b/src/object/background.cpp
@@ -15,7 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "object/background.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
 #include "util/reader.hpp"
 

diff --git a/src/object/bullet.cpp b/src/object/bullet.cpp
index 2161e3b..a4da53a 100644 (file)
--- a/src/object/bullet.cpp
+++ b/src/object/bullet.cpp
@@ -17,7 +17,7 @@
 #include "object/bullet.hpp"
 #include "object/camera.hpp"
 #include "sprite/sprite_manager.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/sector.hpp"
 
 namespace {

diff --git a/src/object/camera.cpp b/src/object/camera.cpp
index 48cd7a3..9c858d3 100644 (file)
--- a/src/object/camera.cpp
+++ b/src/object/camera.cpp
@@ -26,7 +26,7 @@
 #include "object/player.hpp"
 #include "scripting/camera.hpp"
 #include "scripting/squirrel_util.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/sector.hpp"
 
 /* this is the fractional distance toward the peek

diff --git a/src/object/cloud_particle_system.cpp b/src/object/cloud_particle_system.cpp
index 0e2659e..dda8c69 100644 (file)
--- a/src/object/cloud_particle_system.cpp
+++ b/src/object/cloud_particle_system.cpp
@@ -19,7 +19,7 @@
 #include <math.h>
 
 #include "math/random_generator.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 CloudParticleSystem::CloudParticleSystem() :

diff --git a/src/object/display_effect.cpp b/src/object/display_effect.cpp
index 924e7e7..ef46f6e 100644 (file)
--- a/src/object/display_effect.cpp
+++ b/src/object/display_effect.cpp
@@ -17,7 +17,7 @@
 #include "object/display_effect.hpp"
 
 #include "scripting/squirrel_util.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 static const float BORDER_SIZE = 75;

diff --git a/src/object/falling_coin.cpp b/src/object/falling_coin.cpp
index 73b9302..66b2c2e 100644 (file)
--- a/src/object/falling_coin.cpp
+++ b/src/object/falling_coin.cpp
@@ -17,7 +17,7 @@
 #include "object/falling_coin.hpp"
 
 #include "sprite/sprite_manager.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 
 FallingCoin::FallingCoin(const Vector& start_position, const int vel_x) :
   physic(),

diff --git a/src/object/fireworks.cpp b/src/object/fireworks.cpp
index 6532c89..a903fa8 100644 (file)
--- a/src/object/fireworks.cpp
+++ b/src/object/fireworks.cpp
@@ -19,7 +19,7 @@
 #include "object/camera.hpp"
 #include "object/fireworks.hpp"
 #include "object/particles.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/sector.hpp"
 #include "video/drawing_context.hpp"
 

diff --git a/src/object/floating_image.cpp b/src/object/floating_image.cpp
index 07aa120..c7e586a 100644 (file)
--- a/src/object/floating_image.cpp
+++ b/src/object/floating_image.cpp
@@ -17,7 +17,7 @@
 #include "object/floating_image.hpp"
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 
 FloatingImage::FloatingImage(const std::string& spritefile) :
   sprite(),

diff --git a/src/object/ghost_particle_system.cpp b/src/object/ghost_particle_system.cpp
index 4b493a4..aca6ccd 100644 (file)
--- a/src/object/ghost_particle_system.cpp
+++ b/src/object/ghost_particle_system.cpp
@@ -19,7 +19,7 @@
 #include <math.h>
 
 #include "math/random_generator.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 //FIXME: Sometimes both ghosts have the same image

diff --git a/src/object/level_time.cpp b/src/object/level_time.cpp
index 1f92c11..26de88d 100644 (file)
--- a/src/object/level_time.cpp
+++ b/src/object/level_time.cpp
@@ -19,7 +19,7 @@
 #include "object/player.hpp"
 #include "scripting/level_time.hpp"
 #include "scripting/squirrel_util.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/sector.hpp"

diff --git a/src/object/magicblock.cpp b/src/object/magicblock.cpp
index 973c764..4081cf9 100644 (file)
--- a/src/object/magicblock.cpp
+++ b/src/object/magicblock.cpp
@@ -23,7 +23,7 @@
 #include "object/camera.hpp"
 #include "object/magicblock.hpp"
 #include "sprite/sprite.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/sector.hpp"
 

diff --git a/src/object/particles.cpp b/src/object/particles.cpp
index 18432ea..910136b 100644 (file)
--- a/src/object/particles.cpp
+++ b/src/object/particles.cpp
@@ -20,7 +20,7 @@
 
 #include "math/random_generator.hpp"
 #include "object/camera.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/sector.hpp"
 #include "video/drawing_context.hpp"
 

diff --git a/src/object/particlesystem.cpp b/src/object/particlesystem.cpp
index e6e18ca..7684696 100644 (file)
--- a/src/object/particlesystem.cpp
+++ b/src/object/particlesystem.cpp
@@ -19,7 +19,7 @@
 #include <math.h>
 
 #include "math/random_generator.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 ParticleSystem::ParticleSystem(float max_particle_size) :

diff --git a/src/object/particlesystem_interactive.cpp b/src/object/particlesystem_interactive.cpp
index 5347f13..1628af6 100644 (file)
--- a/src/object/particlesystem_interactive.cpp
+++ b/src/object/particlesystem_interactive.cpp
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "object/particlesystem_interactive.hpp"
-#include "supertux/main.hpp"
 
 #include "math/aatriangle.hpp"
 #include "math/random_generator.hpp"
@@ -23,6 +22,7 @@
 #include "object/rainsplash.hpp"
 #include "object/tilemap.hpp"
 #include "supertux/collision.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/tile.hpp"
 
 //TODO: Find a way to make rain collide with objects like bonus blocks

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 1de4610..052a4c5 100644 (file)
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -30,7 +30,7 @@
 #include "object/sprite_particle.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "supertux/game_session.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/sector.hpp"
 #include "supertux/tile.hpp"
 #include "trigger/climbable.hpp"

diff --git a/src/object/snow_particle_system.cpp b/src/object/snow_particle_system.cpp
index 406ca08..a6a2add 100644 (file)
--- a/src/object/snow_particle_system.cpp
+++ b/src/object/snow_particle_system.cpp
@@ -19,7 +19,7 @@
 #include <math.h>
 
 #include "math/random_generator.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 SnowParticleSystem::SnowParticleSystem()

diff --git a/src/object/sprite_particle.cpp b/src/object/sprite_particle.cpp
index 07d8732..21725d8 100644 (file)
--- a/src/object/sprite_particle.cpp
+++ b/src/object/sprite_particle.cpp
@@ -17,7 +17,7 @@
 
 #include "object/camera.hpp"
 #include "object/sprite_particle.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/sector.hpp"
 
 SpriteParticle::SpriteParticle(std::string sprite_name, std::string action, 

diff --git a/src/object/text_object.cpp b/src/object/text_object.cpp
index efe8708..d40bfbf 100644 (file)
--- a/src/object/text_object.cpp
+++ b/src/object/text_object.cpp
@@ -17,7 +17,7 @@
 #include "object/text_object.hpp"
 
 #include "scripting/squirrel_util.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
 

diff --git a/src/object/thunderstorm.cpp b/src/object/thunderstorm.cpp
index cd92605..61e60df 100644 (file)
--- a/src/object/thunderstorm.cpp
+++ b/src/object/thunderstorm.cpp
@@ -19,7 +19,7 @@
 #include "audio/sound_manager.hpp"
 #include "object/electrifier.hpp"
 #include "scripting/squirrel_util.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/sector.hpp"
 #include "util/reader.hpp"

diff --git a/src/object/tilemap.cpp b/src/object/tilemap.cpp
index 535a807..7dd4bb8 100644 (file)
--- a/src/object/tilemap.cpp
+++ b/src/object/tilemap.cpp
@@ -19,7 +19,7 @@
 #include "object/tilemap.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "scripting/tilemap.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/tile_manager.hpp"
 #include "supertux/tile_set.hpp"

diff --git a/src/scripting/functions.cpp b/src/scripting/functions.cpp
index 1f8ed94..853f204 100644 (file)
--- a/src/scripting/functions.cpp
+++ b/src/scripting/functions.cpp
@@ -24,7 +24,7 @@
 #include "supertux/fadeout.hpp"
 #include "supertux/game_session.hpp"
 #include "supertux/gameconfig.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/sector.hpp"
 #include "supertux/shrinkfade.hpp"

diff --git a/src/supertux/console.cpp b/src/supertux/console.cpp
index ce03f40..860869b 100644 (file)
--- a/src/supertux/console.cpp
+++ b/src/supertux/console.cpp
@@ -22,7 +22,7 @@
 #include "physfs/ifile_stream.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "supertux/gameconfig.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 /// speed (pixels/s) the console closes

diff --git a/src/supertux/fadeout.cpp b/src/supertux/fadeout.cpp
index 58d2ecd..8259beb 100644 (file)
--- a/src/supertux/fadeout.cpp
+++ b/src/supertux/fadeout.cpp
@@ -15,7 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "supertux/fadeout.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 FadeOut::FadeOut(float fade_time, Color color)

diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp
index 40242e1..7da344b 100644 (file)
--- a/src/supertux/game_session.cpp
+++ b/src/supertux/game_session.cpp
@@ -32,7 +32,7 @@
 #include "scripting/squirrel_util.hpp"
 #include "supertux/gameconfig.hpp"
 #include "supertux/levelintro.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/options_menu.hpp"
 #include "supertux/sector.hpp"

diff --git a/src/supertux/gameconfig.cpp b/src/supertux/gameconfig.cpp
index dbef165..be8bb70 100644 (file)
--- a/src/supertux/gameconfig.cpp
+++ b/src/supertux/gameconfig.cpp
@@ -23,7 +23,7 @@
 #include "lisp/lisp.hpp"
 #include "lisp/writer.hpp"
 #include "lisp/parser.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 
 Config* g_config = 0;
 

diff --git a/src/supertux/globals.cpp b/src/supertux/globals.cpp
new file mode 100644 (file)
index 0000000..1089c13
--- /dev/null
+++ b/src/supertux/globals.cpp
@@ -0,0 +1,27 @@
+//  SuperTux
+//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmx.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "supertux/globals.hpp"
+#include "tinygettext/tinygettext.hpp"
+
+SDL_Surface* g_screen;
+JoystickKeyboardController* g_main_controller = 0;
+TinyGetText::DictionaryManager dictionary_manager;
+
+int SCREEN_WIDTH;
+int SCREEN_HEIGHT;
+
+/* EOF */

diff --git a/src/supertux/globals.hpp b/src/supertux/globals.hpp
new file mode 100644 (file)
index 0000000..eb9a252
--- /dev/null
+++ b/src/supertux/globals.hpp
@@ -0,0 +1,40 @@
+//  SuperTux
+//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmx.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_SUPERTUX_GLOBALS_HPP
+#define HEADER_SUPERTUX_SUPERTUX_GLOBALS_HPP
+
+#include <SDL.h>
+
+/** The width of the display (this is a logical value, not the
+    physical value, since aspect_ration and projection_area might
+    shrink or scale things) */
+extern int SCREEN_WIDTH;
+
+/** The width of the display (this is a logical value, not the
+    physical value, since aspect_ration and projection_area might
+    shrink or scale things) */
+extern int SCREEN_HEIGHT;
+
+// global variables
+class  JoystickKeyboardController;
+extern JoystickKeyboardController* g_main_controller;
+
+extern SDL_Surface* g_screen;
+
+#endif
+
+/* EOF */

diff --git a/src/supertux/info_box.cpp b/src/supertux/info_box.cpp
index 323bbfc..c6d997f 100644 (file)
--- a/src/supertux/info_box.cpp
+++ b/src/supertux/info_box.cpp
@@ -16,7 +16,7 @@
 
 #include "supertux/info_box.hpp"
 
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/info_box_line.hpp"
 #include "util/log.hpp"
 #include "video/drawing_context.hpp"

diff --git a/src/supertux/levelintro.cpp b/src/supertux/levelintro.cpp
index cc5dec4..16df722 100644 (file)
--- a/src/supertux/levelintro.cpp
+++ b/src/supertux/levelintro.cpp
@@ -20,7 +20,7 @@
 #include "math/random_generator.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "supertux/fadeout.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/resources.hpp"
 #include "util/gettext.hpp"

diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index 6e150c2..91943bd 100644 (file)
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -36,21 +36,16 @@ namespace supertux_apple {
 #include "supertux/gameconfig.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/resources.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/title_screen.hpp"
 #include "util/file_system.hpp"
 #include "util/gettext.hpp"
 #include "video/drawing_context.hpp"
+#include "supertux/globals.hpp"
 #include "worldmap/worldmap.hpp"
 
 namespace { DrawingContext *context_pointer; }
 
-SDL_Surface* g_screen;
-JoystickKeyboardController* g_main_controller = 0;
-TinyGetText::DictionaryManager dictionary_manager;
-
-int SCREEN_WIDTH;
-int SCREEN_HEIGHT;
-
 static void init_config()
 {
   g_config = new Config();

diff --git a/src/supertux/main.hpp b/src/supertux/main.hpp
index 4bfe7e6..e034feb 100644 (file)
--- a/src/supertux/main.hpp
+++ b/src/supertux/main.hpp
@@ -20,20 +20,6 @@
 void init_video();
 void wait_for_event(float min_delay, float max_delay);
 
-/** The width of the display (this is a logical value, not the
-    physical value, since aspect_ration and projection_area might
-    shrink or scale things) */
-extern int SCREEN_WIDTH;
-
-/** The width of the display (this is a logical value, not the
-    physical value, since aspect_ration and projection_area might
-    shrink or scale things) */
-extern int SCREEN_HEIGHT;
-
-// global variables
-class  JoystickKeyboardController;
-extern JoystickKeyboardController* g_main_controller;
-
 int supertux_main(int argc, char** argv);
 
 #endif

diff --git a/src/supertux/mainloop.cpp b/src/supertux/mainloop.cpp
index d6dd0a3..7fe5d5c 100644 (file)
--- a/src/supertux/mainloop.cpp
+++ b/src/supertux/mainloop.cpp
@@ -24,6 +24,7 @@
 #include "supertux/constants.hpp"
 #include "supertux/console.hpp"
 #include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/main.hpp"
 #include "supertux/player_status.hpp"
 #include "supertux/resources.hpp"

diff --git a/src/supertux/options_menu.cpp b/src/supertux/options_menu.cpp
index e218a10..f77b3dd 100644 (file)
--- a/src/supertux/options_menu.cpp
+++ b/src/supertux/options_menu.cpp
@@ -22,6 +22,7 @@
 #include "gui/menu.hpp"
 #include "gui/menu_item.hpp"
 #include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/main.hpp"
 #include "supertux/profile_menu.hpp"
 #include "supertux/language_menu.hpp"

diff --git a/src/supertux/player_status.cpp b/src/supertux/player_status.cpp
index c194679..97a124d 100644 (file)
--- a/src/supertux/player_status.cpp
+++ b/src/supertux/player_status.cpp
@@ -20,7 +20,7 @@
 #include "audio/sound_manager.hpp"
 #include "lisp/lisp.hpp"
 #include "util/writer.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/player_status.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/timer.hpp"

diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
index d2ea9b1..11f5367 100644 (file)
--- a/src/supertux/sector.cpp
+++ b/src/supertux/sector.cpp
@@ -48,7 +48,7 @@
 #include "supertux/collision.hpp"
 #include "supertux/constants.hpp"
 #include "supertux/level.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/spawn_point.hpp"
 #include "supertux/tile.hpp"

diff --git a/src/supertux/shrinkfade.cpp b/src/supertux/shrinkfade.cpp
index e83d081..03ca3c1 100644 (file)
--- a/src/supertux/shrinkfade.cpp
+++ b/src/supertux/shrinkfade.cpp
@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/shrinkfade.hpp"
 #include "video/drawing_context.hpp"
 

diff --git a/src/supertux/statistics.cpp b/src/supertux/statistics.cpp
index a273715..3cea415 100644 (file)
--- a/src/supertux/statistics.cpp
+++ b/src/supertux/statistics.cpp
@@ -22,7 +22,7 @@
 #include <limits>
 
 #include "scripting/squirrel_util.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "util/gettext.hpp"
 #include "video/drawing_context.hpp"

diff --git a/src/supertux/textscroller.cpp b/src/supertux/textscroller.cpp
index 84f0737..49ac9c2 100644 (file)
--- a/src/supertux/textscroller.cpp
+++ b/src/supertux/textscroller.cpp
@@ -22,7 +22,7 @@
 #include "lisp/parser.hpp"
 #include "supertux/fadeout.hpp"
 #include "supertux/info_box_line.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"

diff --git a/src/supertux/title_screen.cpp b/src/supertux/title_screen.cpp
index 55fb4e9..17fdac0 100644 (file)
--- a/src/supertux/title_screen.cpp
+++ b/src/supertux/title_screen.cpp
@@ -32,7 +32,7 @@
 #include "object/player.hpp"
 #include "supertux/fadeout.hpp"
 #include "supertux/gameconfig.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/options_menu.hpp"
 #include "supertux/resources.hpp"

diff --git a/src/trigger/climbable.cpp b/src/trigger/climbable.cpp
index 416fb00..6fc957f 100644 (file)
--- a/src/trigger/climbable.cpp
+++ b/src/trigger/climbable.cpp
@@ -17,7 +17,7 @@
 #include "trigger/climbable.hpp"
 
 #include "object/player.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
 #include "util/gettext.hpp"
 #include "util/reader.hpp"

diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp
index 8f3366b..d333eab 100644 (file)
--- a/src/trigger/secretarea_trigger.cpp
+++ b/src/trigger/secretarea_trigger.cpp
@@ -18,7 +18,7 @@
 
 #include "object/tilemap.hpp"
 #include "supertux/level.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/sector.hpp"

diff --git a/src/video/drawing_context.cpp b/src/video/drawing_context.cpp
index 82890be..90cb1db 100644 (file)
--- a/src/video/drawing_context.cpp
+++ b/src/video/drawing_context.cpp
@@ -21,7 +21,7 @@
 
 #include "obstack/obstackpp.hpp"
 #include "supertux/gameconfig.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_request.hpp"
 #include "video/lightmap.hpp"
 #include "video/renderer.hpp"

diff --git a/src/video/gl/gl_lightmap.cpp b/src/video/gl/gl_lightmap.cpp
index fe77db3..120aae6 100644 (file)
--- a/src/video/gl/gl_lightmap.cpp
+++ b/src/video/gl/gl_lightmap.cpp
@@ -28,7 +28,7 @@
 
 #include "obstack/obstackpp.hpp"
 #include "supertux/gameconfig.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/lightmap.hpp"
 #include "video/drawing_context.hpp"
 #include "video/drawing_request.hpp"

diff --git a/src/video/gl/gl_renderer.cpp b/src/video/gl/gl_renderer.cpp
index e05f755..41c8eec 100644 (file)
--- a/src/video/gl/gl_renderer.cpp
+++ b/src/video/gl/gl_renderer.cpp
@@ -22,7 +22,7 @@
 #include <physfs.h>
 
 #include "supertux/gameconfig.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_request.hpp"
 #include "video/gl/gl_surface_data.hpp"
 #include "video/gl/gl_texture.hpp"

diff --git a/src/video/sdl/sdl_surface_data.hpp b/src/video/sdl/sdl_surface_data.hpp
index f3ee5c1..47268ee 100644 (file)
--- a/src/video/sdl/sdl_surface_data.hpp
+++ b/src/video/sdl/sdl_surface_data.hpp
@@ -20,7 +20,7 @@
 #include <config.h>
 
 #include "supertux/gameconfig.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/surface.hpp"
 #include "video/texture.hpp"
 

diff --git a/src/video/sdl/sdl_texture.cpp b/src/video/sdl/sdl_texture.cpp
index 412c776..0bdd714 100644 (file)
--- a/src/video/sdl/sdl_texture.cpp
+++ b/src/video/sdl/sdl_texture.cpp
@@ -17,7 +17,7 @@
 #include <config.h>
 
 #include "supertux/gameconfig.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/color.hpp"
 #include "video/sdl/sdl_texture.hpp"
 

diff --git a/src/worldmap/tux.cpp b/src/worldmap/tux.cpp
index 7fca49a..a98cfd9 100644 (file)
--- a/src/worldmap/tux.cpp
+++ b/src/worldmap/tux.cpp
@@ -19,7 +19,7 @@
 #include "scripting/squirrel_util.hpp"
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/player_status.hpp"
 #include "supertux/tile.hpp"
 #include "worldmap/level.hpp"

diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp
index 1321dff..cbf550f 100644 (file)
--- a/src/worldmap/worldmap.cpp
+++ b/src/worldmap/worldmap.cpp
@@ -43,7 +43,7 @@
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "supertux/game_session.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/options_menu.hpp"
 #include "supertux/player_status.hpp"