Fixed compiler warnings due to new loglevel aware log macro

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

diff --git a/src/supertux/globals.hpp b/src/supertux/globals.hpp
index 86a62b4..6aca5eb 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,17 @@
 #ifndef HEADER_SUPERTUX_SUPERTUX_GLOBALS_HPP
 #define HEADER_SUPERTUX_SUPERTUX_GLOBALS_HPP
 
-#include <SDL.h>
-
+typedef struct SDL_Surface SDL_Surface;
+namespace tinygettext { class DictionaryManager; }
 class Config;
-class JoystickKeyboardController;
-class SoundManager;
+class InputManager;
+class PlayerStatus;
 class ScreenManager;
+class SoundManager;
+class SpriteManager;
 class TextureManager;
+class TileManager;
+class TileSet;
 
 /** The width of the display (this is a logical value, not the
     physical value, since aspect_ration and projection_area might
@@ -36,9 +40,7 @@ extern int SCREEN_WIDTH;
 extern int SCREEN_HEIGHT;
 
 // global variables
-extern JoystickKeyboardController* g_main_controller;
-
-extern SDL_Surface* g_screen;
+extern InputManager* g_input_manager;
 
 extern ScreenManager* g_screen_manager;
 
@@ -48,9 +50,20 @@ extern SoundManager* sound_manager;
 
 extern Config* g_config;
 
+extern tinygettext::DictionaryManager* dictionary_manager;
+
 extern float game_time;
 extern float real_time;
 
+extern TileManager *tile_manager;
+
+/** this is only set while loading a map */
+extern TileSet     *current_tileset;
+
+extern SpriteManager* sprite_manager;
+
+extern float g_game_speed;
+
 #endif
 
 /* EOF */