* Comment out resizable flag because it blue-screens on Windows

* Editor images are shown in debug builds

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@5937 837edb03-e0f3-0310-88ca-d4d4e8b29345

diff --git a/src/tile.cpp b/src/tile.cpp
index 661117b..9e0d39b 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -106,9 +106,19 @@ Tile::parse(const lisp::Lisp& reader)
     attributes |= SOLID | SLOPE;
   }
 
-  const lisp::Lisp* images = reader.get_lisp("images");
+  const lisp::Lisp* images;
+#ifdef DEBUG
+  images = reader.get_lisp("editor-images");
   if(images)
     parse_images(*images);
+  else {
+#endif /*DEBUG*/
+    images = reader.get_lisp("images");
+    if(images)
+      parse_images(*images);
+#ifdef DEBUG
+  }
+#endif /*DEBUG*/
 
   correct_attributes();
   return id;

diff --git a/src/video/gl_renderer.cpp b/src/video/gl_renderer.cpp
index 1d062c4..c861595 100644 (file)
--- a/src/video/gl_renderer.cpp
+++ b/src/video/gl_renderer.cpp
@@ -177,7 +177,7 @@ Renderer::Renderer()
     }
   else
     {
-      flags |= SDL_RESIZABLE;
+//      flags |= SDL_RESIZABLE;
       width  = config->window_width;
       height = config->window_height;
     }
@@ -546,7 +546,7 @@ Renderer::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*/);
 
   config->window_width  = w;
   config->window_height = h;