[Pingus-CVS] CVS: Games/Pingus/src/worldobjs/entrances cloud.cxx, 1.3, 1.4 woodthing.cxx, 1.8, 1.9 woodthing.hxx, 1.4, 1.5

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src/worldobjs/entrances
In directory dark:/tmp/cvs-serv12729/worldobjs/entrances

Modified Files:
        cloud.cxx woodthing.cxx woodthing.hxx 
Log Message:
- replaced a few CL_Surfaces with CL_Sprite

Index: cloud.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrances/cloud.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cloud.cxx   19 Oct 2003 12:25:48 -0000      1.3
+++ cloud.cxx   20 Oct 2003 13:11:09 -0000      1.4
@@ -30,7 +30,7 @@
 {
   data->pos.z = 100;
 
-  surface = PingusResource::load_surface("Entrances/cloud","entrances");
+  surface = PingusResource::load_sprite("Entrances/cloud","entrances");
 }
 
 void

Index: woodthing.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrances/woodthing.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- woodthing.cxx       19 Oct 2003 12:25:48 -0000      1.8
+++ woodthing.cxx       20 Oct 2003 13:11:09 -0000      1.9
@@ -32,13 +32,13 @@
 WoodThing::WoodThing (const WorldObjsData::EntranceData& data_)
   : Entrance(data_)
 {
-  surface  = PingusResource::load_surface("Entrances/woodthing_mov" , 
"entrances");
-  surface2 = PingusResource::load_surface("Entrances/woodthing_nmov", 
"entrances");
+  surface  = PingusResource::load_sprite("Entrances/woodthing_mov" , 
"entrances");
+  surface2 = PingusResource::load_sprite("Entrances/woodthing_nmov", 
"entrances");
 
-  counter.set_size(surface.get_num_frames());
+  counter.set_size(surface.get_frame_count());
   counter.set_type(GameCounter::once);
   counter.set_speed(2);
-  counter = surface.get_num_frames() - 1;
+  counter = surface.get_frame_count() - 1;
 }
 
 void
@@ -61,9 +61,9 @@
 WoodThing::draw (GraphicContext& gc)
 {
   gc.draw(surface,
-         static_cast<int>(data->pos.x - surface.get_width () /  2),
-         static_cast<int>(data->pos.y - surface.get_height() + 32),
-         counter);
+         Vector(static_cast<int>(data->pos.x - surface.get_width () /  2),
+                 static_cast<int>(data->pos.y - surface.get_height() + 32)),
+         (int)counter);
 }
 
 } // namespace Entrances

Index: woodthing.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrances/woodthing.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- woodthing.hxx       19 Oct 2003 12:25:48 -0000      1.4
+++ woodthing.hxx       20 Oct 2003 13:11:09 -0000      1.5
@@ -31,7 +31,7 @@
 {
 private:
   GameCounter counter;
-  CL_Surface  surface2;
+  CL_Sprite   surface2;
 
 public:
   WoodThing (const WorldObjsData::EntranceData& data_);