some new GhostTree stuff

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a715926..2f624f9 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -372,8 +372,10 @@ void init_video()
     desktop_height = info->current_h;
   }
 
-  /* we want vsync for smooth scrolling */
-  SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
+  if(config->try_vsync) {
+    /* we want vsync for smooth scrolling */
+       SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
+  }
 #endif
 
   SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
@@ -411,11 +413,13 @@ void init_video()
   }
 #endif
 
+  SDL_ShowCursor(0);
+
   double aspect_ratio = config->aspect_ratio;
 
   // try to guess aspect ratio of monitor if needed
   if (aspect_ratio <= 0) {
-    if(desktop_width > 0) {
+    if(config->use_fullscreen && desktop_width > 0) {
       aspect_ratio = static_cast<double>(desktop_width) / static_cast<double>(desktop_height);
     } else {
       aspect_ratio = 4.0 / 3.0;
@@ -431,6 +435,8 @@ void init_video()
        SCREEN_HEIGHT = static_cast<int> (600 * 1/aspect_ratio);
   }
 
+  log_info << (config->use_fullscreen?"fullscreen ":"window ") << SCREEN_WIDTH << "x" << SCREEN_HEIGHT << "\n";
+
   // setup opengl state and transform
   glDisable(GL_DEPTH_TEST);
   glDisable(GL_CULL_FACE);