[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx, 1.13, 1.14 bumper.hxx, 1.8, 1.9 conveyor_belt.hxx, 1.17, 1.18 entrance.cxx, 1.13, 1.14 entrance.hxx, 1.5, 1.6 exit.cxx, 1.8, 1.9 exit.hxx, 1.4, 1.5 fake_exit.hxx, 1.8, 1.9 groundpiece.hxx, 1.7, 1.8 guillotine.hxx, 1.6, 1.7 hammer.hxx, 1.9, 1.10 hotspot.hxx, 1.6, 1.7 ice_block.hxx, 1.16, 1.17 info_box.cxx, 1.20, 1.21 laser_exit.cxx, 1.12, 1.13 rain_generator.cxx, 1.10, 1.11 snow_generator.cxx, 1.8, 1.9 snow_generator.hxx, 1.7, 1.8 solid_color_background.cxx, 1.4, 1.5 solid_color_background.hxx, 1.6, 1.7 spike.hxx, 1.6, 1.7 starfield_background.cxx, 1.6, 1.7 starfield_background.hxx, 1.7, 1.8 starfield_background_stars.cxx, 1.8, 1.9 starfield_background_stars.hxx, 1.6, 1.7 surface_background.cxx, 1.11, 1.12 surface_background.hxx, 1.6, 1.7 switch_door.hxx, 1.19, 1.20 thunderstorm_background.hxx, 1.7, 1.8

[Ingo Ruhnke]

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

Modified Files:
        bumper.cxx bumper.hxx conveyor_belt.hxx entrance.cxx 
        entrance.hxx exit.cxx exit.hxx fake_exit.hxx groundpiece.hxx 
        guillotine.hxx hammer.hxx hotspot.hxx ice_block.hxx 
        info_box.cxx laser_exit.cxx rain_generator.cxx 
        snow_generator.cxx snow_generator.hxx 
        solid_color_background.cxx solid_color_background.hxx 
        spike.hxx starfield_background.cxx starfield_background.hxx 
        starfield_background_stars.cxx starfield_background_stars.hxx 
        surface_background.cxx surface_background.hxx switch_door.hxx 
        thunderstorm_background.hxx 
Log Message:
- bunch of little fixes for CL0.7, some parts are compilable, but still a bit 
more todo

Index: bumper.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/bumper.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- bumper.cxx  19 Apr 2003 10:23:19 -0000      1.13
+++ bumper.cxx  18 Oct 2003 23:17:28 -0000      1.14
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <ClanLib/Display/Display/surfaceprovider.h>
+#include <ClanLib/Display/surfaceprovider.h>
 #include "../col_map.hxx"
 #include "../gui/graphic_context.hxx"
 #include "../pingu.hxx"

Index: bumper.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/bumper.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bumper.hxx  19 Apr 2003 10:23:19 -0000      1.8
+++ bumper.hxx  18 Oct 2003 23:17:28 -0000      1.9
@@ -22,6 +22,8 @@
 
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class BumperData;
 } // namespace WorldObjsData
@@ -55,6 +57,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: conveyor_belt.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/conveyor_belt.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- conveyor_belt.hxx   19 Apr 2003 10:23:19 -0000      1.17
+++ conveyor_belt.hxx   18 Oct 2003 23:17:28 -0000      1.18
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_CONVEYOR_BELT_HXX
 #define HEADER_PINGUS_WORLDOBJS_CONVEYOR_BELT_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 #include "../worldobj_data.hxx"
 #include "../editor/rect_editorobj.hxx"

Index: entrance.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrance.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- entrance.cxx        19 Apr 2003 10:23:19 -0000      1.13
+++ entrance.cxx        18 Oct 2003 23:17:28 -0000      1.14
@@ -28,6 +28,7 @@
 #include "../smallmap.hxx"
 #include "entrance.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Entrance::Entrance (const WorldObjsData::EntranceData& data_)
@@ -143,5 +144,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: entrance.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrance.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- entrance.hxx        19 Apr 2003 10:23:19 -0000      1.5
+++ entrance.hxx        18 Oct 2003 23:17:28 -0000      1.6
@@ -20,10 +20,12 @@
 #ifndef HEADER_PINGUS_ENTRANCE_HXX
 #define HEADER_PINGUS_ENTRANCE_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../sprite.hxx"
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class EntranceData;
 }
@@ -64,6 +66,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: exit.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/exit.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exit.cxx    19 Feb 2003 09:50:36 -0000      1.8
+++ exit.cxx    18 Oct 2003 23:17:28 -0000      1.9
@@ -29,6 +29,7 @@
 #include "../smallmap.hxx"
 #include "exit.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Exit::Exit (const WorldObjsData::ExitData& data_)
@@ -107,5 +108,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: exit.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/exit.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exit.hxx    19 Apr 2003 10:23:19 -0000      1.4
+++ exit.hxx    18 Oct 2003 23:17:28 -0000      1.5
@@ -23,6 +23,8 @@
 #include "../worldobj.hxx"
 #include "../sprite.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class ExitData;
 }
@@ -56,6 +58,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: fake_exit.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/fake_exit.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fake_exit.hxx       19 Apr 2003 10:23:19 -0000      1.8
+++ fake_exit.hxx       18 Oct 2003 23:17:28 -0000      1.9
@@ -23,6 +23,8 @@
 #include "../worldobj.hxx"
 #include "../sprite.hxx"
 
+namespace Pingus {
+
 class Pingu;
 
 namespace WorldObjsData {
@@ -62,6 +64,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: groundpiece.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/groundpiece.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- groundpiece.hxx     19 Apr 2003 10:23:19 -0000      1.7
+++ groundpiece.hxx     18 Oct 2003 23:17:28 -0000      1.8
@@ -20,9 +20,11 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_GROUNDPIECE_HXX
 #define HEADER_PINGUS_WORLDOBJS_GROUNDPIECE_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class GroundpieceData;
 }
@@ -52,6 +54,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: guillotine.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/guillotine.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- guillotine.hxx      1 Oct 2002 19:53:46 -0000       1.6
+++ guillotine.hxx      18 Oct 2003 23:17:28 -0000      1.7
@@ -22,6 +22,8 @@
 
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class GuillotineData;
 }
@@ -53,6 +55,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: hammer.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/hammer.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hammer.hxx  19 Apr 2003 10:23:19 -0000      1.9
+++ hammer.hxx  18 Oct 2003 23:17:28 -0000      1.10
@@ -23,6 +23,8 @@
 #include "../sprite.hxx"
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class HammerData;
 } // namespace WorldObjsData
@@ -52,6 +54,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: hotspot.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/hotspot.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hotspot.hxx 19 Apr 2003 10:23:19 -0000      1.6
+++ hotspot.hxx 18 Oct 2003 23:17:28 -0000      1.7
@@ -23,6 +23,8 @@
 #include "../worldobj.hxx"
 #include "../sprite.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class HotspotData;
 }
@@ -49,6 +51,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: ice_block.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/ice_block.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ice_block.hxx       19 Apr 2003 10:23:19 -0000      1.16
+++ ice_block.hxx       18 Oct 2003 23:17:28 -0000      1.17
@@ -20,9 +20,11 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_ICE_BLOCK_HXX
 #define HEADER_PINGUS_WORLDOBJS_ICE_BLOCK_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class IceBlockData;
 }
@@ -54,6 +56,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: info_box.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- info_box.cxx        19 Apr 2003 10:23:19 -0000      1.20
+++ info_box.cxx        18 Oct 2003 23:17:28 -0000      1.21
@@ -17,8 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <ClanLib/Display/Font/font.h>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/font.h>
+#include <ClanLib/Display/display.h>
 #include "../gui/graphic_context.hxx"
 #include "../pingu.hxx"
 #include "../pingu_holder.hxx"

Index: laser_exit.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/laser_exit.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- laser_exit.cxx      19 Apr 2003 10:23:19 -0000      1.12
+++ laser_exit.cxx      18 Oct 2003 23:17:28 -0000      1.13
@@ -26,8 +26,9 @@
 
 namespace WorldObjs {
 
-LaserExit::LaserExit (const WorldObjsData::LaserExitData& data_) : data(new 
WorldObjsData::LaserExitData(data_)),
-                                                                   
killing(false)
+LaserExit::LaserExit (const WorldObjsData::LaserExitData& data_) 
+  : data(new WorldObjsData::LaserExitData(data_)),
+    killing(false)
 {
   data->counter.set_size(data->surface.get_num_frames());
   data->counter.set_type(GameCounter::once);

Index: rain_generator.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/rain_generator.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- rain_generator.cxx  19 Apr 2003 10:23:19 -0000      1.10
+++ rain_generator.cxx  18 Oct 2003 23:17:28 -0000      1.11
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
 #include "../particles/rain_particle_holder.hxx"
 #include "../sound/sound.hxx"
 #include "../world.hxx"

Index: snow_generator.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/snow_generator.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- snow_generator.cxx  19 Apr 2003 10:23:19 -0000      1.8
+++ snow_generator.cxx  18 Oct 2003 23:17:28 -0000      1.9
@@ -25,6 +25,7 @@
 #include "../worldobjsdata/snow_generator_data.hxx"
 #include "snow_generator.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 SnowGenerator::SnowGenerator (const WorldObjsData::SnowGeneratorData& data_)
@@ -71,5 +72,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: snow_generator.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/snow_generator.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- snow_generator.hxx  19 Apr 2003 10:23:19 -0000      1.7
+++ snow_generator.hxx  18 Oct 2003 23:17:28 -0000      1.8
@@ -22,6 +22,8 @@
 
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class SnowGeneratorData;
 }
@@ -47,6 +49,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: solid_color_background.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/solid_color_background.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- solid_color_background.cxx  5 Dec 2002 20:38:10 -0000       1.4
+++ solid_color_background.cxx  18 Oct 2003 23:17:28 -0000      1.5
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
 #include "../worldobjsdata/solid_color_background_data.hxx"
 #include "solid_color_background.hxx"
 
@@ -37,7 +37,7 @@
 SolidColorBackground::draw (GraphicContext& gc)
 {
   // FIXME: should use GraphicContext, not CL_Display
-  CL_Display::clear_display (data->color.red, data->color.green, 
data->color.blue, data->color.alpha);
+  CL_Display::clear(data->color.red, data->color.green, data->color.blue, 
data->color.alpha);
   UNUSED_ARG(gc);
 }
 

Index: solid_color_background.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/solid_color_background.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- solid_color_background.hxx  19 Apr 2003 10:23:19 -0000      1.6
+++ solid_color_background.hxx  18 Oct 2003 23:17:28 -0000      1.7
@@ -22,6 +22,8 @@
 
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class SolidColorBackgroundData;
 }
@@ -49,6 +51,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: spike.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/spike.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- spike.hxx   1 Oct 2002 19:53:46 -0000       1.6
+++ spike.hxx   18 Oct 2003 23:17:28 -0000      1.7
@@ -22,13 +22,14 @@
 
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class SpikeData;
 } // namespace WorldObjsData
 
 class Pingu;
 
-
 namespace WorldObjs {
 
 class Spike : public WorldObj
@@ -55,6 +56,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: starfield_background.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/starfield_background.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- starfield_background.cxx    17 Jun 2003 14:09:20 -0000      1.6
+++ starfield_background.cxx    18 Oct 2003 23:17:28 -0000      1.7
@@ -22,6 +22,7 @@
 #include "starfield_background.hxx"
 #include "starfield_background_stars.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 StarfieldBackground::StarfieldBackground (const 
WorldObjsData::StarfieldBackgroundData& data_)
@@ -68,5 +69,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: starfield_background.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/starfield_background.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- starfield_background.hxx    19 Apr 2003 10:23:19 -0000      1.7
+++ starfield_background.hxx    18 Oct 2003 23:17:28 -0000      1.8
@@ -23,6 +23,8 @@
 #include <vector>
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class StarfieldBackgroundData;
 }
@@ -53,6 +55,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus {
 
 #endif
 

Index: starfield_background_stars.cxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjs/starfield_background_stars.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- starfield_background_stars.cxx      17 Jun 2003 14:09:20 -0000      1.8
+++ starfield_background_stars.cxx      18 Oct 2003 23:17:28 -0000      1.9
@@ -22,6 +22,7 @@
 #include "../pingus_resource.hxx"
 #include "starfield_background_stars.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 StarfieldBackgroundStars::StarfieldBackgroundStars (Type type)
@@ -66,5 +67,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus {
 
 /* EOF */

Index: starfield_background_stars.hxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjs/starfield_background_stars.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- starfield_background_stars.hxx      17 Jun 2003 14:09:20 -0000      1.6
+++ starfield_background_stars.hxx      18 Oct 2003 23:17:28 -0000      1.7
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HXX
 #define HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 
 namespace WorldObjs {

Index: surface_background.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/surface_background.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- surface_background.cxx      16 Aug 2003 21:04:37 -0000      1.11
+++ surface_background.cxx      18 Oct 2003 23:17:28 -0000      1.12
@@ -19,7 +19,7 @@
 
 #include <iostream>
 #include <ClanLib/Display/SurfaceProviders/canvas.h>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
 #include "../gui/graphic_context.hxx"
 #include "../world.hxx"
 #include "../timer.hxx"
@@ -29,6 +29,7 @@
 #include "../worldobjsdata/surface_background_data.hxx"
 #include "surface_background.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 SurfaceBackground::SurfaceBackground (const 
WorldObjsData::SurfaceBackgroundData& data_)
@@ -151,7 +152,7 @@
 {
   if (fast_mode)
     {
-      CL_Display::clear_display();
+      CL_Display::clear();
     }
   else
     {
@@ -196,5 +197,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: surface_background.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/surface_background.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- surface_background.hxx      19 Apr 2003 10:23:19 -0000      1.6
+++ surface_background.hxx      18 Oct 2003 23:17:28 -0000      1.7
@@ -20,10 +20,12 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HXX
 #define HEADER_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 #include "../game_counter.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class SurfaceBackgroundData;
 }
@@ -60,6 +62,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: switch_door.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/switch_door.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- switch_door.hxx     19 Apr 2003 10:23:19 -0000      1.19
+++ switch_door.hxx     18 Oct 2003 23:17:28 -0000      1.20
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_SWITCH_DOOR_HXX
 #define HEADER_PINGUS_WORLDOBJS_SWITCH_DOOR_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 
 namespace WorldObjsData {

Index: thunderstorm_background.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/thunderstorm_background.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- thunderstorm_background.hxx 19 Apr 2003 10:23:19 -0000      1.7
+++ thunderstorm_background.hxx 18 Oct 2003 23:17:28 -0000      1.8
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HXX
 #define HEADER_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 
 namespace WorldObjsData {