X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Fglobals.cpp;h=41628e4dc36137020ac3eda019f0e0712aa595e6;hb=4a3592f77f9c089c33b9eaf2db426999a01b2b78;hp=44359595e7d33204972ee5cfeea6e6df7a8f2eb0;hpb=78bd3d0cb3619297dcab7a9763b40a1da4c6cda2;p=supertux.git

diff --git a/src/supertux/globals.cpp b/src/supertux/globals.cpp
index 44359595e..41628e4dc 100644
--- 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,30 +15,18 @@
 //  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 = 0;
+#include "supertux/gameconfig.hpp"
 
 int SCREEN_WIDTH;
 int SCREEN_HEIGHT;
 
-ScreenManager* g_screen_manager = 0;
-
-TextureManager* texture_manager = 0;
-
-SoundManager* sound_manager = 0;
-
-Config* g_config = 0;
+std::unique_ptr<Config> g_config;
 
 float game_time = 0;
 float real_time = 0;
 
-TileManager* tile_manager    = NULL;
-TileSet*     current_tileset = NULL;
-
-SpriteManager* sprite_manager = NULL;
+TileSet* current_tileset = NULL;
 
 float g_game_speed = 1.0f;