[Pingus-CVS] CVS: Games/Pingus/src client.hxx, 1.28, 1.29 col_map.hxx, 1.12, 1.13 pingus_resource.hxx, 1.17, 1.18 time_display.cxx, 1.16, 1.17 timer.cxx, 1.5, 1.6 timer.hxx, 1.7, 1.8 view.hxx, 1.14, 1.15

[Ingo Ruhnke]

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

Modified Files:
        client.hxx col_map.hxx pingus_resource.hxx time_display.cxx 
        timer.cxx timer.hxx view.hxx 
Log Message:
- some namespace and CL0.7 stuff

Index: client.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/client.hxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- client.hxx  18 Oct 2003 23:17:27 -0000      1.28
+++ client.hxx  20 Oct 2003 13:33:43 -0000      1.29
@@ -21,7 +21,7 @@
 #define HEADER_PINGUS_CLIENT_HXX
 
 #include <ClanLib/Signals/slot.h>
-#include <ClanLib/Display/Input/inputdevice.h>
+#include <ClanLib/Display/inputdevice.h>
 #include "gui/gui_screen.hxx"
 #include "result.hxx"
 #include "sprite.hxx"

Index: col_map.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/col_map.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- col_map.hxx 18 Oct 2003 23:17:27 -0000      1.12
+++ col_map.hxx 20 Oct 2003 13:33:43 -0000      1.13
@@ -79,7 +79,7 @@
   bool blit_allowed (int x, int y,  Groundtype::GPType);
 
   void put(int x, int y, Groundtype::GPType p = Groundtype::GP_GROUND);
-  void put(const CL_Surface&, int x, int y, Groundtype::GPType);
+  void put(const CL_PixelBuffer&, int x, int y, Groundtype::GPType);
   void put(CL_PixelBuffer*, int x, int y, Groundtype::GPType);
 
   /// void remove(int x, int y);

Index: pingus_resource.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_resource.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pingus_resource.hxx 19 Oct 2003 12:25:47 -0000      1.17
+++ pingus_resource.hxx 20 Oct 2003 13:33:43 -0000      1.18
@@ -59,6 +59,7 @@
 
   /** Load a surface from the ResDescriptor */
   static CL_Surface load_surface(const ResDescriptor&);
+  static CL_Sprite  load_sprite(const ResDescriptor&);
   static CL_Sprite  load_sprite(const std::string& res_name,
                                 const std::string& datafile);
 

Index: time_display.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/time_display.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- time_display.cxx    18 Oct 2003 23:17:27 -0000      1.16
+++ time_display.cxx    20 Oct 2003 13:33:43 -0000      1.17
@@ -19,7 +19,7 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
 #include <ClanLib/Display/font.h>
 #include "globals.hxx"
 #include "pingus_resource.hxx"

Index: timer.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/timer.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- timer.cxx   19 Apr 2003 10:23:17 -0000      1.5
+++ timer.cxx   20 Oct 2003 13:33:43 -0000      1.6
@@ -22,6 +22,8 @@
 #include "globals.hxx"
 #include "timer.hxx"
 
+namespace Pingus {
+
 Timer::Timer(const char* desc)
   : description(desc),
     start_time (CL_System::get_time())
@@ -37,4 +39,6 @@
     << time << "msec" << std::endl;
 }
 
+} // namespace Pingus
+
 /* EOF */

Index: timer.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/timer.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- timer.hxx   19 Apr 2003 10:23:17 -0000      1.7
+++ timer.hxx   20 Oct 2003 13:33:43 -0000      1.8
@@ -22,6 +22,8 @@
 
 #include "pingus.hxx"
 
+namespace Pingus {
+
 /** A simple class for benchmark purpose. It lets you start and stop a
     timer and recieve the time passed.*/
 class Timer
@@ -43,6 +45,8 @@
   Timer& operator= (const Timer&);
 };
 
+} // namespace Pingus
+
 #endif
 
 /* EOF */

Index: view.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/view.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- view.hxx    19 Oct 2003 12:25:47 -0000      1.14
+++ view.hxx    20 Oct 2003 13:33:43 -0000      1.15
@@ -40,7 +40,7 @@
 private:
   DisplayGraphicContext display_gc;
 
-  CL_ClipRect clip_rect;
+  CL_Rect clip_rect;
 
   /** The position of the view in the world */
   Range x_offset, y_offset;