Update CMake to 3.2.1 in .travis.yml

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

diff --git a/src/supertux/globals.hpp b/src/supertux/globals.hpp
index 86a62b4..b1d7f4d 100644 (file)
--- a/src/supertux/globals.hpp
+++ b/src/supertux/globals.hpp
@@ -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
@@ -17,13 +17,10 @@
 #ifndef HEADER_SUPERTUX_SUPERTUX_GLOBALS_HPP
 #define HEADER_SUPERTUX_SUPERTUX_GLOBALS_HPP
 
-#include <SDL.h>
+#include <memory>
 
 class Config;
-class JoystickKeyboardController;
-class SoundManager;
-class ScreenManager;
-class TextureManager;
+class TileSet;
 
 /** The width of the display (this is a logical value, not the
     physical value, since aspect_ration and projection_area might
@@ -35,22 +32,16 @@ extern int SCREEN_WIDTH;
     shrink or scale things) */
 extern int SCREEN_HEIGHT;
 
-// global variables
-extern JoystickKeyboardController* g_main_controller;
-
-extern SDL_Surface* g_screen;
-
-extern ScreenManager* g_screen_manager;
-
-extern TextureManager* texture_manager;
-
-extern SoundManager* sound_manager;
-
-extern Config* g_config;
+extern std::unique_ptr<Config> g_config;
 
 extern float game_time;
 extern float real_time;
 
+/** this is only set while loading a map */
+extern TileSet* current_tileset;
+
+extern float g_game_speed;
+
 #endif
 
 /* EOF */