[Pingus-CVS] CVS: Games/Pingus/src/worldobjs/entrances Makefile.am, 1.1, 1.2 cloud.cxx, 1.2, 1.3 cloud.hxx, 1.2, 1.3 woodthing.cxx, 1.7, 1.8 woodthing.hxx, 1.3, 1.4

[Ingo Ruhnke]

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

Modified Files:
        Makefile.am cloud.cxx cloud.hxx woodthing.cxx woodthing.hxx 
Log Message:
- some more stuff, still not much useable

Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrances/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am 27 Sep 2002 15:01:20 -0000      1.1
+++ Makefile.am 19 Oct 2003 12:25:48 -0000      1.2
@@ -19,6 +19,7 @@
 
 noinst_LIBRARIES = libpingus_worldobjs_entrances.a
 
+libpingus_worldobjs_entrances_a_CPPFLAGS = @PINGUS_CFLAGS@
 libpingus_worldobjs_entrances_a_SOURCES = \
        cloud.cxx       cloud.hxx \
        woodthing.cxx   woodthing.hxx

Index: cloud.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrances/cloud.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cloud.cxx   19 Apr 2003 10:23:19 -0000      1.2
+++ cloud.cxx   19 Oct 2003 12:25:48 -0000      1.3
@@ -21,6 +21,7 @@
 #include "../../worldobjsdata/entrance_data.hxx"
 #include "cloud.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 namespace Entrances {
 
@@ -36,16 +37,19 @@
 Cloud::draw_offset (int x, int y, float s)
 {
   if (s == 1.0) {
-    surface.put_screen(static_cast<int>(x + data->pos.x - 115),
+    surface.draw(static_cast<int>(x + data->pos.x - 115),
                       static_cast<int>(y + data->pos.y - 100));
   } else {
-    surface.put_screen(static_cast<int>((data->pos.x - 32 + x) * s),
+#ifdef CLANLIB_0_6
+    surface.draw(static_cast<int>((data->pos.x - 32 + x) * s),
                       static_cast<int>((data->pos.y - 16 + y) * s),
-                      s, s);
+                 s, s);
+#endif
   }
 }
 
 } // namespace Entrances
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: cloud.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrances/cloud.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cloud.hxx   19 Apr 2003 10:23:19 -0000      1.2
+++ cloud.hxx   19 Oct 2003 12:25:48 -0000      1.3
@@ -22,6 +22,7 @@
 
 #include "../entrance.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 namespace Entrances {
 
@@ -39,6 +40,7 @@
 
 } // namespace Entrances
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: woodthing.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrances/woodthing.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- woodthing.cxx       19 Apr 2003 10:23:19 -0000      1.7
+++ woodthing.cxx       19 Oct 2003 12:25:48 -0000      1.8
@@ -25,6 +25,7 @@
 #include "../../worldobjsdata/entrance_data.hxx"
 #include "woodthing.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 namespace Entrances {
 
@@ -67,5 +68,6 @@
 
 } // namespace Entrances
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: woodthing.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrances/woodthing.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- woodthing.hxx       19 Apr 2003 10:23:19 -0000      1.3
+++ woodthing.hxx       19 Oct 2003 12:25:48 -0000      1.4
@@ -23,6 +23,7 @@
 #include "../../game_counter.hxx"
 #include "../entrance.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 namespace Entrances {
 
@@ -45,6 +46,7 @@
 
 } // namespace Entrances
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif