Removed trailing whitespace from all *.?pp files

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

diff --git a/src/supertux/gameconfig.hpp b/src/supertux/gameconfig.hpp
index 0fd89e6..8558d69 100644 (file)
--- a/src/supertux/gameconfig.hpp
+++ b/src/supertux/gameconfig.hpp
@@ -18,6 +18,7 @@
 #define HEADER_SUPERTUX_SUPERTUX_GAMECONFIG_HPP
 
 #include "video/video_systems.hpp"
+#include "math/size.hpp"
 
 class Config
 {
@@ -31,21 +32,21 @@ public:
   int profile;
 
   // the width/height to be used to display the game in fullscreen
-  int fullscreen_width;
-  int fullscreen_height;
+  Size fullscreen_size;
 
-  // the width/height of the window managers window 
-  int window_width;
-  int window_height;
+  // refresh rate for use in fullscreen, 0 for auto
+  int fullscreen_refresh_rate;
+
+  /** the width/height of the window managers window */
+  Size window_size;
+
+  /** the aspect ratio */
+  Size aspect_size;
 
-  // the aspect ratio
-  int aspect_width;
-  int aspect_height;
-  
   float magnification;
 
   bool use_fullscreen;
-  VideoSystem video;
+  VideoSystem::Enum video;
   bool try_vsync;
   bool show_fps;
   bool sound_enabled;
@@ -63,8 +64,6 @@ public:
   std::string locale; /**< force SuperTux language to this locale, e.g. "de". A file "data/locale/xx.po" must exist for this to work. An empty string means autodetect. */
 };
 
-extern Config* g_config;
-
 #endif
 
 /* EOF */