[Pingus-CVS] CVS: Games/Pingus/src/editorobjs conveyor_belt_obj.hxx, 1.10, 1.11 switch_door_obj.cxx, 1.10, 1.11 switch_door_obj.hxx, 1.9, 1.10

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src/editorobjs
In directory dark:/tmp/cvs-serv18306/editorobjs

Modified Files:
        conveyor_belt_obj.hxx switch_door_obj.cxx switch_door_obj.hxx 
Log Message:
- some namespace and CL0.7 stuff

Index: conveyor_belt_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/conveyor_belt_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- conveyor_belt_obj.hxx       19 Oct 2003 12:25:47 -0000      1.10
+++ conveyor_belt_obj.hxx       20 Oct 2003 13:33:43 -0000      1.11
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_EDITOROBJS_CONVEYOR_BELT_OBJ_HXX
 #define HEADER_PINGUS_EDITOROBJS_CONVEYOR_BELT_OBJ_HXX
 
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
 #include "../editor/rect_editorobj.hxx"
 
 namespace Pingus {

Index: switch_door_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- switch_door_obj.cxx 19 Oct 2003 12:25:47 -0000      1.10
+++ switch_door_obj.cxx 20 Oct 2003 13:33:43 -0000      1.11
@@ -29,10 +29,10 @@
 
 SwitchDoorObj::SwitchDoorObj (const WorldObjsData::SwitchDoorData& data_)
   : data(new WorldObjsData::SwitchDoorData(data_)),
-    door_box      (PingusResource::load_surface("switchdoor_box"      , 
"worldobjs")),
-    door_tile     (PingusResource::load_surface("switchdoor_tile"     , 
"worldobjs")),
-    door_tile_cmap(PingusResource::load_surface("switchdoor_tile_cmap", 
"worldobjs")),
-    switch_sur    (PingusResource::load_surface("switchdoor_switch"   , 
"worldobjs"))
+    door_box      (PingusResource::load_sprite("switchdoor_box"      , 
"worldobjs")),
+    door_tile     (PingusResource::load_sprite("switchdoor_tile"     , 
"worldobjs")),
+    
door_tile_cmap(PingusResource::load_surface_provider("switchdoor_tile_cmap", 
"worldobjs")),
+    switch_sur    (PingusResource::load_sprite("switchdoor_switch"   , 
"worldobjs"))
 {
 }
 

Index: switch_door_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- switch_door_obj.hxx 18 Oct 2003 23:17:28 -0000      1.9
+++ switch_door_obj.hxx 20 Oct 2003 13:33:43 -0000      1.10
@@ -35,10 +35,10 @@
 private:
   WorldObjsData::SwitchDoorData* const data;
 
-  CL_Surface door_box;
-  CL_Surface door_tile;
-  CL_Surface door_tile_cmap;
-  CL_Surface switch_sur;
+  CL_Sprite door_box;
+  CL_Sprite door_tile;
+  CL_PixelBuffer door_tile_cmap;
+  CL_Sprite switch_sur;
 
 public:
   friend class SwitchDoorSwitchObj;