[Pingus-CVS] r4089 - trunk/pingus/src/engine/display

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-30 21:26:23 +0100 (Mon, 30 Nov 2009)
New Revision: 4089

Modified:
   trunk/pingus/src/engine/display/sdl_framebuffer.cpp
Log:
Workaround for rect.is_normal() failures


Modified: trunk/pingus/src/engine/display/sdl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-30 19:54:47 UTC 
(rev 4088)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-30 20:26:23 UTC 
(rev 4089)
@@ -331,9 +331,14 @@
 }
 
 void
-SDLFramebuffer::draw_rect(const Rect& rect, const Color& color)
+SDLFramebuffer::draw_rect(const Rect& rect_, const Color& color)
 {
-  assert(rect.is_normal());
+  Rect rect = rect_;
+  if (!rect.is_normal())
+  {
+    std::cout << "SDLFramebuffer::draw_rect: unnormal rect supplied" << 
std::endl;
+    rect.normalize();
+  }  
 
   draw_line(Vector2i(rect.left,    rect.top),      Vector2i(rect.right-1, 
rect.top),      color);
   draw_line(Vector2i(rect.left,    rect.bottom-1), Vector2i(rect.right-1, 
rect.bottom-1), color);
@@ -342,9 +347,14 @@
 }
 
 void
-SDLFramebuffer::fill_rect(const Rect& rect, const Color& color)
+SDLFramebuffer::fill_rect(const Rect& rect_, const Color& color)
 {
-  assert(rect.is_normal());
+  Rect rect = rect_;
+  if (!rect.is_normal())
+  {
+    std::cout << "SDLFramebuffer::draw_rect: unnormal rect supplied" << 
std::endl;
+    rect.normalize();
+  }  
 
   if (color.a == 255)
   {