[Pingus-CVS] CVS: Games/Pingus/src/worldobjs solid_color_background.cxx,1.2,1.3 solid_color_background.hxx,1.4,1.5 thunderstorm_background.cxx,1.3,1.4 thunderstorm_background.hxx,1.5,1.6

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv30864/src/worldobjs

Modified Files:
        solid_color_background.cxx solid_color_background.hxx 
        thunderstorm_background.cxx thunderstorm_background.hxx 
Log Message:
- little cleanup here and there
- added level names to the worldmap
- added absolute time to gamedelta


Index: solid_color_background.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjs/solid_color_background.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- solid_color_background.cxx  27 Sep 2002 18:36:41 -0000      1.2
+++ solid_color_background.cxx  27 Nov 2002 20:05:42 -0000      1.3
@@ -34,14 +34,10 @@
 }
 
 void
-SolidColorBackground::draw_offset (int x_of, int y_of, float s)
+SolidColorBackground::draw (GraphicContext& gc)
 {
-  // FIXME: Probally fill_rect is better here, but slower?
+  // FIXME: should use GraphicContext, not CL_Display
   CL_Display::clear_display (data->color.red, data->color.green, 
data->color.blue, data->color.alpha);
-
-  UNUSED_ARG(x_of);
-  UNUSED_ARG(y_of);
-  UNUSED_ARG(s);
 }
 
 } // namespace WorldObjs

Index: solid_color_background.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjs/solid_color_background.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- solid_color_background.hxx  1 Oct 2002 19:53:46 -0000       1.4
+++ solid_color_background.hxx  27 Nov 2002 20:05:42 -0000      1.5
@@ -41,7 +41,7 @@
   float get_z_pos () const { return -10; }  
   void update () {}
   
-  void draw_offset (int x_of, int y_of, float s = 1.0);
+  void draw (GraphicContext& gc);
   
 private:
   SolidColorBackground (const SolidColorBackground&);

Index: thunderstorm_background.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjs/thunderstorm_background.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thunderstorm_background.cxx 1 Oct 2002 19:53:46 -0000       1.3
+++ thunderstorm_background.cxx 27 Nov 2002 20:05:42 -0000      1.4
@@ -19,6 +19,7 @@
 
 #include "../pingus_resource.hxx"
 #include "../worldobjsdata/thunderstorm_background_data.hxx"
+#include "../graphic_context.hxx"
 #include "thunderstorm_background.hxx"
 
 namespace WorldObjs {
@@ -52,9 +53,9 @@
 }
 
 void
-ThunderstormBackground::draw_offset (int x_of, int y_of, float /*s*/)
+ThunderstormBackground::draw (GraphicContext& gc)
 {
-  clouds_sur.put_screen(x_pos + x_of, y_of);
+  gc.draw(clouds_sur, x_pos, 0);
 }
 
 } // namespace WorldObjs

Index: thunderstorm_background.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjs/thunderstorm_background.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- thunderstorm_background.hxx 1 Oct 2002 19:53:46 -0000       1.5
+++ thunderstorm_background.hxx 27 Nov 2002 20:05:42 -0000      1.6
@@ -44,7 +44,7 @@
   float get_z_pos () const;
   
   void update ();
-  void draw_offset (int x_of, int y_of, float s = 1.0);
+  void draw (GraphicContext& gc);
   
 private:
   ThunderstormBackground (const ThunderstormBackground&);