[Pingus-CVS] r2717 - branches/pingus_sdl/src

[jsalmon3]

Author: jsalmon3
Date: 2007-07-13 06:45:39 +0200 (Fri, 13 Jul 2007)
New Revision: 2717

Modified:
   branches/pingus_sdl/src/ground_map.cpp
   branches/pingus_sdl/src/multiline_text.cpp
Log:
Disabled bad debug draw, fixed warning

Modified: branches/pingus_sdl/src/ground_map.cpp
===================================================================
--- branches/pingus_sdl/src/ground_map.cpp      2007-07-13 04:13:54 UTC (rev 
2716)
+++ branches/pingus_sdl/src/ground_map.cpp      2007-07-13 04:45:39 UTC (rev 
2717)
@@ -147,7 +147,7 @@
               }
             else
               {
-                if (pingus_debug_flags & PINGUS_DEBUG_TILES)
+                if (0 /*pingus_debug_flags & PINGUS_DEBUG_TILES*/)
                   gc.color().draw_fillrect((float)x * tile_size,
                                            (float)y * tile_size,
                                            (float)x * tile_size + tile_size,

Modified: branches/pingus_sdl/src/multiline_text.cpp
===================================================================
--- branches/pingus_sdl/src/multiline_text.cpp  2007-07-13 04:13:54 UTC (rev 
2716)
+++ branches/pingus_sdl/src/multiline_text.cpp  2007-07-13 04:45:39 UTC (rev 
2717)
@@ -77,7 +77,7 @@
   for(std::vector<std::string>::iterator i = text.begin(); i != text.end(); 
++i)
          width = Math::max(width, font.get_size(i->c_str()).width);
 
-  height = text.size() * font.get_height();
+  height = (int)text.size() * font.get_height();
 }
 
 void