[Pingus-CVS] rev 2320 - in trunk/src: . editor

[Ingo Ruhnke]

Author: grumbel
Date: 2004-05-09 16:42:59 +0200 (Sun, 09 May 2004)
New Revision: 2320

Modified:
   trunk/src/blitter.cxx
   trunk/src/editor/scroll_map.cxx
   trunk/src/spot_map.cxx
Log:
- added some map remove code

Modified: trunk/src/blitter.cxx
===================================================================
--- trunk/src/blitter.cxx       2004-05-09 14:30:46 UTC (rev 2319)
+++ trunk/src/blitter.cxx       2004-05-09 14:42:59 UTC (rev 2320)
@@ -290,7 +290,11 @@
 void
 Blitter::fill_rect(CL_PixelBuffer target, const CL_Rect& rect, const CL_Color& 
color)
 {
-  assert(target.get_format().get_depth() == 32);
+  if (target.get_format().get_depth() != 32)
+    {
+      std::cout << "Blitter::fill_rect: depth must be 32 but is " << 
target.get_format().get_depth() << std::endl;
+      return;
+    }
 
   target.lock();
   

Modified: trunk/src/editor/scroll_map.cxx
===================================================================
--- trunk/src/editor/scroll_map.cxx     2004-05-09 14:30:46 UTC (rev 2319)
+++ trunk/src/editor/scroll_map.cxx     2004-05-09 14:42:59 UTC (rev 2320)
@@ -79,7 +79,11 @@
 {
   CL_Display::fill_rect (CL_Rect(x_pos, y_pos, x_pos + width, y_pos + height),
                         CL_Color(100, 100, 0));
+#ifdef CLANLIB_0_6  
+  // disabled, since without scaling its useless
   Editor::instance()->get_object_manager()->draw(view);
+#endif
+
   /*
   int viewarea_width = (CL_Display::get_width() * width
                        / editor_event->object_manager->get_width());

Modified: trunk/src/spot_map.cxx
===================================================================
--- trunk/src/spot_map.cxx      2004-05-09 14:30:46 UTC (rev 2319)
+++ trunk/src/spot_map.cxx      2004-05-09 14:42:59 UTC (rev 2320)
@@ -57,7 +57,8 @@
 {
   if (surface)
     {
-      
+      Blitter::put_alpha_surface(pixelbuffer, obj, x, y);
+      surface = CL_Surface(new CL_PixelBuffer(pixelbuffer), true);
     }
 }