[Pingus-CVS] r2544 - trunk/src/worldobjs

[jave27]

Author: jave27
Date: 2005-12-07 02:23:08 +0100 (Wed, 07 Dec 2005)
New Revision: 2544

Modified:
   trunk/src/worldobjs/exit.cxx
   trunk/src/worldobjs/switch_door.cxx
Log:
Used the new CL get_frame_pixeldata() function to correct the pixel remove 
issue.

Modified: trunk/src/worldobjs/exit.cxx
===================================================================
--- trunk/src/worldobjs/exit.cxx        2005-12-06 03:28:27 UTC (rev 2543)
+++ trunk/src/worldobjs/exit.cxx        2005-12-07 01:23:08 UTC (rev 2544)
@@ -59,8 +59,7 @@
 void
 Exit::on_startup ()
 {
-  CL_PixelBuffer pixelbuffer = sprite.get_frame_surface(0).get_pixeldata();
-  world->get_colmap()->remove(pixelbuffer,
+  world->get_colmap()->remove(sprite.get_frame_pixeldata(0),
                              static_cast<int>(pos.x) - sprite.get_width()/2,
                              static_cast<int>(pos.y) - sprite.get_height());
 }

Modified: trunk/src/worldobjs/switch_door.cxx
===================================================================
--- trunk/src/worldobjs/switch_door.cxx 2005-12-06 03:28:27 UTC (rev 2543)
+++ trunk/src/worldobjs/switch_door.cxx 2005-12-07 01:23:08 UTC (rev 2544)
@@ -50,7 +50,7 @@
 void
 SwitchDoor::on_startup ()
 {
-  world->get_colmap()->put(door_box.get_frame_surface(0).get_pixeldata(),
+  world->get_colmap()->put(door_box.get_frame_pixeldata(0),
                            static_cast<int>(door_pos.x),
                           static_cast<int>(door_pos.y),
                           Groundtype::GP_SOLID);
@@ -105,7 +105,7 @@
                        // it, we remove the door from the colmap
                        if (current_door_height + 10 < door_height)
                        {
-                               
world->get_colmap()->put(door_box.get_frame_surface(0).get_pixeldata(),
+                               
world->get_colmap()->put(door_box.get_frame_pixeldata(0),
                                        static_cast<int>(door_pos.x),
                                        static_cast<int>(door_pos.y),
                                        Groundtype::GP_NOTHING);