[Pingus-CVS] CVS: Games/Pingus/src/worldmap manager.cxx, 1.41, 1.42 surface_drawable.cxx, 1.7, 1.8 surface_drawable.hxx, 1.7, 1.8 worldmap.cxx, 1.52, 1.53 worldmap.hxx, 1.31, 1.32

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv21266/src/worldmap

Modified Files:
        manager.cxx surface_drawable.cxx surface_drawable.hxx 
        worldmap.cxx worldmap.hxx 
Log Message:
- replaced a few CL_Surface with CL_Sprite

Index: manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- manager.cxx 21 Oct 2003 11:01:52 -0000      1.41
+++ manager.cxx 14 Dec 2003 00:30:04 -0000      1.42
@@ -190,7 +190,7 @@
 {
   if (WorldMapManager::instance()->get_worldmap()->get_pingus()->is_walking())
     {
-      gc.draw(button_surface, x_pos, y_pos);
+      gc.draw(button_surface, Vector(x_pos, y_pos));
     }
   else
     {

Index: surface_drawable.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/surface_drawable.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_drawable.cxx        21 Oct 2003 11:01:52 -0000      1.7
+++ surface_drawable.cxx        14 Dec 2003 00:30:04 -0000      1.8
@@ -42,7 +42,7 @@
   reader.read_vector ("position", pos);
   reader.read_bool ("auto-uncover", auto_uncover);
 
-  surface = PingusResource::load_surface(desc);
+  surface = PingusResource::load_sprite(desc);
 }
 
 void

Index: surface_drawable.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/surface_drawable.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_drawable.hxx        20 Oct 2003 19:28:55 -0000      1.7
+++ surface_drawable.hxx        14 Dec 2003 00:30:04 -0000      1.8
@@ -20,7 +20,7 @@
 #ifndef HEADER_SURFACE_DRAWABLE_HXX
 #define HEADER_SURFACE_DRAWABLE_HXX
 
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
 #include "../vector.hxx"
 #include "drawable.hxx"
 
@@ -31,7 +31,7 @@
 class SurfaceDrawable : public Drawable
 {
 private:
-  CL_Surface surface;
+  CL_Sprite surface;
   Vector     pos;
   /** If set to true the surface will disappear if the pingu gets
       covered by it, so that the Pingu can travel into caves and other

Index: worldmap.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/worldmap.cxx,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- worldmap.cxx        21 Oct 2003 11:01:52 -0000      1.52
+++ worldmap.cxx        14 Dec 2003 00:30:04 -0000      1.53
@@ -106,7 +106,7 @@
 
   add_drawable(pingus);
 
-  levelname_bg = PingusResource::load_surface("worldmap/levelname_bg", "core");
+  levelname_bg = PingusResource::load_sprite("worldmap/levelname_bg", "core");
   xmlFreeDoc(doc);
 }
 
@@ -230,8 +230,8 @@
     }
 
   gc.draw(levelname_bg,
-          gc.get_width()/2 - levelname_bg.get_width()/2,
-          gc.get_height() - levelname_bg.get_height());
+          Vector(gc.get_width()/2 - levelname_bg.get_width()/2,
+                 gc.get_height() - levelname_bg.get_height()));
 
   if (pingus->get_node() != NoNode)
     {

Index: worldmap.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/worldmap.hxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- worldmap.hxx        21 Oct 2003 11:01:52 -0000      1.31
+++ worldmap.hxx        14 Dec 2003 00:30:04 -0000      1.32
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDMAP_WORLDMAP_HXX
 #define HEADER_PINGUS_WORLDMAP_WORLDMAP_HXX
 
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
 #include <vector>
 #include "../libxmlfwd.hxx"
 #include "../gui/display_graphic_context.hxx"
@@ -53,7 +53,7 @@
   // FIXME: We should use a ScrollGC or something like that here
   DisplayGraphicContext display_gc;
 
-  CL_Surface levelname_bg;
+  CL_Sprite levelname_bg;
 
   /** name of the file to parse */
   std::string filename;