change some LAYER_GUI to LAYER_HUD, update tinygettext, fix a warning in miniswig

[supertux.git] / src / video / gl / gl_renderer.cpp

diff --git a/src/video/gl/gl_renderer.cpp b/src/video/gl/gl_renderer.cpp
index b578977..d9ab2e6 100644 (file)
--- a/src/video/gl/gl_renderer.cpp
+++ b/src/video/gl/gl_renderer.cpp
@@ -180,7 +180,7 @@ GLRenderer::GLRenderer() :
     throw std::runtime_error(out.str());
   }
   log_info << "Using GLEW " << glewGetString(GLEW_VERSION) << std::endl;
-  log_info << "GL_ARB_texture_non_power_of_two: " << GL_ARB_texture_non_power_of_two << std::endl;
+  log_info << "GLEW_ARB_texture_non_power_of_two: " << GLEW_ARB_texture_non_power_of_two << std::endl;
 #endif
 }
 
@@ -520,7 +520,7 @@ GLRenderer::resize(int w, int h)
 {
   // This causes the screen to go black, which is annoying, but seems
   // unavoidable with SDL at the moment
-  SDL_SetVideoMode(w, h, 0, SDL_OPENGL /*| SDL_RESIZABLE*/);
+  SDL_SetVideoMode(w, h, 0, SDL_OPENGL | SDL_RESIZABLE);
 
   g_config->window_size = Size(w, h);
 
@@ -530,15 +530,15 @@ GLRenderer::resize(int w, int h)
 void
 GLRenderer::apply_config()
 {    
-  if (1)
+  if (false)
   {
-    std::cout << "Applying Config:" 
-              << "\n  Desktop: " << desktop_size.width << "x" << desktop_size.height
-              << "\n  Window:  " << g_config->window_size
-              << "\n  FullRes: " << g_config->fullscreen_size
-              << "\n  Aspect:  " << g_config->aspect_size
-              << "\n  Magnif:  " << g_config->magnification
-              << std::endl;
+    log_info << "Applying Config:" 
+             << "\n  Desktop: " << desktop_size.width << "x" << desktop_size.height
+             << "\n  Window:  " << g_config->window_size
+             << "\n  FullRes: " << g_config->fullscreen_size
+             << "\n  Aspect:  " << g_config->aspect_size
+             << "\n  Magnif:  " << g_config->magnification
+             << std::endl;
   }
 
   float target_aspect = static_cast<float>(desktop_size.width) / static_cast<float>(desktop_size.height);