Added some m_ prefixes and made variables private in World

[supertux.git] / src / supertux / globals.cpp

diff --git a/src/supertux/globals.cpp b/src/supertux/globals.cpp
index 22a7311..7f1a9f8 100644 (file)
--- a/src/supertux/globals.cpp
+++ b/src/supertux/globals.cpp
@@ -1,5 +1,5 @@
 //  SuperTux
-//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmail.com>
 //
 //  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
@@ -15,13 +15,30 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "supertux/globals.hpp"
-#include "tinygettext/tinygettext.hpp"
+#include <tinygettext/tinygettext.hpp>
 
-SDL_Surface* g_screen;
-JoystickKeyboardController* g_main_controller = 0;
-tinygettext::DictionaryManager dictionary_manager;
+InputManager* g_input_manager = 0;
+tinygettext::DictionaryManager* dictionary_manager = 0;
 
 int SCREEN_WIDTH;
 int SCREEN_HEIGHT;
 
+ScreenManager* g_screen_manager = 0;
+
+TextureManager* texture_manager = 0;
+
+SoundManager* sound_manager = 0;
+
+Config* g_config = 0;
+
+float game_time = 0;
+float real_time = 0;
+
+TileManager* tile_manager    = NULL;
+TileSet*     current_tileset = NULL;
+
+SpriteManager* sprite_manager = NULL;
+
+float g_game_speed = 1.0f;
+
 /* EOF */