[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx, 1.12, 1.13 bumper_data.hxx, 1.8, 1.9 conveyor_belt_data.cxx, 1.12, 1.13 conveyor_belt_data.hxx, 1.9, 1.10 entrance_data.cxx, 1.9, 1.10 entrance_data.hxx, 1.6, 1.7 exit_data.cxx, 1.10, 1.11 exit_data.hxx, 1.6, 1.7 fake_exit_data.cxx, 1.11, 1.12 fake_exit_data.hxx, 1.8, 1.9 groundpiece_data.cxx, 1.18, 1.19 groundpiece_data.hxx, 1.8, 1.9 guillotine_data.cxx, 1.12, 1.13 guillotine_data.hxx, 1.8, 1.9 hammer_data.cxx, 1.13, 1.14 hammer_data.hxx, 1.9, 1.10 hotspot_data.cxx, 1.8, 1.9 hotspot_data.hxx, 1.8, 1.9 ice_block_data.cxx, 1.11, 1.12 ice_block_data.hxx, 1.8, 1.9 info_box_data.cxx, 1.13, 1.14 info_box_data.hxx, 1.8, 1.9 laser_exit_data.cxx, 1.11, 1.12 laser_exit_data.hxx, 1.8, 1.9 liquid_data.cxx, 1.14, 1.15 liquid_data.hxx, 1.8, 1.9 prefab_obj_data.cxx, 1.12, 1.13 prefab_obj_data.hxx, 1.9, 1.10 rain_generator_data.cxx, 1.6, 1.7 rain_generator_data.hxx, 1.7, 1.8 smasher_data.cxx, 1.11, 1.12 smasher_data.hxx, 1.8, 1.9 snow_generator_data.cxx, 1.8, 1.9 snow_generator_data.hxx, 1.10, 1.11 solid_color_background_data.cxx, 1.7, 1.8 solid_color_background_data.hxx, 1.7, 1.8 spike_data.cxx, 1.12, 1.13 spike_data.hxx, 1.9, 1.10 starfield_background_data.cxx, 1.11, 1.12 starfield_background_data.hxx, 1.6, 1.7 surface_background_data.cxx, 1.12, 1.13 surface_background_data.hxx, 1.8, 1.9 switch_door_data.cxx, 1.12, 1.13 switch_door_data.hxx, 1.8, 1.9 teleporter_data.cxx, 1.13, 1.14 teleporter_data.hxx, 1.8, 1.9 thunderstorm_background_data.cxx, 1.7, 1.8 thunderstorm_background_data.hxx, 1.7, 1.8 worldobj_group_data.cxx, 1.12, 1.13 worldobj_group_data.hxx, 1.8, 1.9

[Ingo Ruhnke]

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

Modified Files:
        bumper_data.cxx bumper_data.hxx conveyor_belt_data.cxx 
        conveyor_belt_data.hxx entrance_data.cxx entrance_data.hxx 
        exit_data.cxx exit_data.hxx fake_exit_data.cxx 
        fake_exit_data.hxx groundpiece_data.cxx groundpiece_data.hxx 
        guillotine_data.cxx guillotine_data.hxx hammer_data.cxx 
        hammer_data.hxx hotspot_data.cxx hotspot_data.hxx 
        ice_block_data.cxx ice_block_data.hxx info_box_data.cxx 
        info_box_data.hxx laser_exit_data.cxx laser_exit_data.hxx 
        liquid_data.cxx liquid_data.hxx prefab_obj_data.cxx 
        prefab_obj_data.hxx rain_generator_data.cxx 
        rain_generator_data.hxx smasher_data.cxx smasher_data.hxx 
        snow_generator_data.cxx snow_generator_data.hxx 
        solid_color_background_data.cxx 
        solid_color_background_data.hxx spike_data.cxx spike_data.hxx 
        starfield_background_data.cxx starfield_background_data.hxx 
        surface_background_data.cxx surface_background_data.hxx 
        switch_door_data.cxx switch_door_data.hxx teleporter_data.cxx 
        teleporter_data.hxx thunderstorm_background_data.cxx 
        thunderstorm_background_data.hxx worldobj_group_data.cxx 
        worldobj_group_data.hxx 
Log Message:
- bunch of little fixes for CL0.7, some parts are compilable, but still a bit 
more todo

Index: bumper_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/bumper_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bumper_data.cxx     19 Apr 2003 10:23:19 -0000      1.12
+++ bumper_data.cxx     18 Oct 2003 23:17:28 -0000      1.13
@@ -27,6 +27,7 @@
 #include "../pingus_resource.hxx"
 #include "../editor/editorobj_mgr.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 BumperData::BumperData ()
@@ -66,6 +67,7 @@
   obj_mgr->add(new EditorObjs::BumperObj(*this));
 }
 
-} // WorldObjsData
+} // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: bumper_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/bumper_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bumper_data.hxx     19 Apr 2003 10:23:19 -0000      1.8
+++ bumper_data.hxx     18 Oct 2003 23:17:28 -0000      1.9
@@ -21,10 +21,12 @@
 #define HEADER_PINGUS_WORLDOBJSDATA_BUMPER_DATA_HXX
 
 #include "../vector.hxx"
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 
 class BumperData : public WorldObjData {
@@ -49,6 +51,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: conveyor_belt_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/conveyor_belt_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- conveyor_belt_data.cxx      19 Apr 2003 10:23:19 -0000      1.12
+++ conveyor_belt_data.cxx      18 Oct 2003 23:17:28 -0000      1.13
@@ -26,6 +26,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "conveyor_belt_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 ConveyorBeltData::ConveyorBeltData ()
@@ -78,5 +79,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: conveyor_belt_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/conveyor_belt_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- conveyor_belt_data.hxx      19 Apr 2003 10:23:19 -0000      1.9
+++ conveyor_belt_data.hxx      18 Oct 2003 23:17:28 -0000      1.10
@@ -24,6 +24,7 @@
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class ConveyorBeltData : public WorldObjData
@@ -54,6 +55,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: entrance_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/entrance_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- entrance_data.cxx   19 Apr 2003 10:23:19 -0000      1.9
+++ entrance_data.cxx   18 Oct 2003 23:17:28 -0000      1.10
@@ -29,6 +29,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "entrance_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 EntranceData::EntranceData () : direction(MISC),
@@ -125,5 +126,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: entrance_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/entrance_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- entrance_data.hxx   19 Apr 2003 10:23:19 -0000      1.6
+++ entrance_data.hxx   18 Oct 2003 23:17:28 -0000      1.7
@@ -25,6 +25,7 @@
 #include "../res_descriptor.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class EntranceData : public WorldObjData
@@ -57,6 +58,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: exit_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/exit_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- exit_data.cxx       19 Apr 2003 10:23:19 -0000      1.10
+++ exit_data.cxx       18 Oct 2003 23:17:28 -0000      1.11
@@ -27,6 +27,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "exit_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 ExitData::ExitData () : owner_id(0),
@@ -86,6 +87,7 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */
 

Index: exit_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/exit_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- exit_data.hxx       19 Apr 2003 10:23:19 -0000      1.6
+++ exit_data.hxx       18 Oct 2003 23:17:28 -0000      1.7
@@ -25,6 +25,7 @@
 #include "../res_descriptor.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class ExitData : public WorldObjData
@@ -57,11 +58,8 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 
 /* EOF */
-
-
-
-

Index: fake_exit_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/fake_exit_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fake_exit_data.cxx  5 Mar 2003 19:13:59 -0000       1.11
+++ fake_exit_data.cxx  18 Oct 2003 23:17:28 -0000      1.12
@@ -27,6 +27,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "../pingus_resource.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 FakeExitData::FakeExitData ()
@@ -66,5 +67,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: fake_exit_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/fake_exit_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fake_exit_data.hxx  19 Apr 2003 10:23:19 -0000      1.8
+++ fake_exit_data.hxx  18 Oct 2003 23:17:28 -0000      1.9
@@ -21,11 +21,12 @@
 #define HEADER_PINGUS_WORLDOBJSDATA_FAKE_EXIT_DATA_HXX
 
 #include "../vector.hxx"
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../game_counter.hxx"
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class FakeExitData : public WorldObjData {
@@ -51,6 +52,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: groundpiece_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/groundpiece_data.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- groundpiece_data.cxx        19 Apr 2003 10:23:19 -0000      1.18
+++ groundpiece_data.cxx        18 Oct 2003 23:17:28 -0000      1.19
@@ -28,6 +28,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "groundpiece_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 GroundpieceData::GroundpieceData ()
@@ -131,5 +132,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: groundpiece_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/groundpiece_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- groundpiece_data.hxx        19 Apr 2003 10:23:19 -0000      1.8
+++ groundpiece_data.hxx        18 Oct 2003 23:17:28 -0000      1.9
@@ -21,12 +21,14 @@
 #define HEADER_PINGUS_GROUNDPIECE_DATA_HXX
 
 #include "../vector.hxx"
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../libxmlfwd.hxx"
 #include "../res_descriptor.hxx"
 #include "../worldobj_data.hxx"
 #include "../groundtype.hxx"
 
+namespace Pingus {
+
 class FileWriter;
 class FileReader;
 
@@ -59,6 +61,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: guillotine_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/guillotine_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- guillotine_data.cxx 19 Apr 2003 10:23:19 -0000      1.12
+++ guillotine_data.cxx 18 Oct 2003 23:17:28 -0000      1.13
@@ -27,6 +27,7 @@
 #include "../pingus_resource.hxx"
 #include "../editor/editorobj_mgr.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 GuillotineData::GuillotineData ()
@@ -72,5 +73,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: guillotine_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/guillotine_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- guillotine_data.hxx 19 Apr 2003 10:23:19 -0000      1.8
+++ guillotine_data.hxx 18 Oct 2003 23:17:28 -0000      1.9
@@ -27,6 +27,7 @@
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class GuillotineData : public WorldObjData {
@@ -55,6 +56,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: hammer_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/hammer_data.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hammer_data.cxx     19 Apr 2003 10:23:19 -0000      1.13
+++ hammer_data.cxx     18 Oct 2003 23:17:28 -0000      1.14
@@ -26,6 +26,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "../pingus_resource.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 HammerData::HammerData ()
@@ -65,6 +66,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */
-

Index: hammer_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/hammer_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hammer_data.hxx     19 Apr 2003 10:23:19 -0000      1.9
+++ hammer_data.hxx     18 Oct 2003 23:17:28 -0000      1.10
@@ -20,13 +20,14 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_HAMMER_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_HAMMER_DATA_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../vector.hxx"
 #include "../world.hxx"
 #include "../game_counter.hxx"
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class HammerData : public WorldObjData {
@@ -50,6 +51,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: hotspot_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/hotspot_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hotspot_data.cxx    19 Apr 2003 10:23:19 -0000      1.8
+++ hotspot_data.cxx    18 Oct 2003 23:17:28 -0000      1.9
@@ -27,6 +27,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "hotspot_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 HotspotData::HotspotData () : speed(-1), para(1.0)
@@ -73,6 +74,7 @@
   obj_mgr->add(new EditorObjs::HotspotObj(*this));
 }
 
-} //namespace WorldObjsData
+} // namespace WorldObjsData
+} // namespace Pingus 
 
 /* EOF */

Index: hotspot_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/hotspot_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hotspot_data.hxx    19 Apr 2003 10:23:19 -0000      1.8
+++ hotspot_data.hxx    18 Oct 2003 23:17:28 -0000      1.9
@@ -25,6 +25,7 @@
 #include "../res_descriptor.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class HotspotData : public WorldObjData
@@ -51,6 +52,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: ice_block_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/ice_block_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ice_block_data.cxx  19 Apr 2003 10:23:19 -0000      1.11
+++ ice_block_data.cxx  18 Oct 2003 23:17:28 -0000      1.12
@@ -26,6 +26,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "ice_block_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 IceBlockData::IceBlockData ()
@@ -69,5 +70,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: ice_block_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/ice_block_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ice_block_data.hxx  19 Apr 2003 10:23:19 -0000      1.8
+++ ice_block_data.hxx  18 Oct 2003 23:17:28 -0000      1.9
@@ -24,6 +24,7 @@
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class IceBlockData : public WorldObjData
@@ -54,6 +55,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: info_box_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/info_box_data.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- info_box_data.cxx   19 Apr 2003 10:23:19 -0000      1.13
+++ info_box_data.cxx   18 Oct 2003 23:17:28 -0000      1.14
@@ -26,6 +26,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "info_box_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 InfoBoxData::InfoBoxData ()
@@ -73,5 +74,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: info_box_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/info_box_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- info_box_data.hxx   19 Apr 2003 10:23:19 -0000      1.8
+++ info_box_data.hxx   18 Oct 2003 23:17:28 -0000      1.9
@@ -27,6 +27,7 @@
 
 class CL_Font;
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class InfoBoxData : public WorldObjData
@@ -55,6 +56,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: laser_exit_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/laser_exit_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- laser_exit_data.cxx 5 Mar 2003 19:13:59 -0000       1.11
+++ laser_exit_data.cxx 18 Oct 2003 23:17:28 -0000      1.12
@@ -27,6 +27,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "../pingus_resource.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 LaserExitData::LaserExitData ()
@@ -66,5 +67,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: laser_exit_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/laser_exit_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- laser_exit_data.hxx 19 Apr 2003 10:23:19 -0000      1.8
+++ laser_exit_data.hxx 18 Oct 2003 23:17:28 -0000      1.9
@@ -20,12 +20,13 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_LASER_EXIT_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_LASER_EXIT_DATA_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../vector.hxx"
 #include "../game_counter.hxx"
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class LaserExitData : public WorldObjData {
@@ -51,6 +52,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: liquid_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/liquid_data.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- liquid_data.cxx     19 Apr 2003 10:23:19 -0000      1.14
+++ liquid_data.cxx     18 Oct 2003 23:17:28 -0000      1.15
@@ -27,6 +27,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "liquid_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 LiquidData::LiquidData ()
@@ -89,5 +90,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: liquid_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/liquid_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- liquid_data.hxx     19 Apr 2003 10:23:19 -0000      1.8
+++ liquid_data.hxx     18 Oct 2003 23:17:28 -0000      1.9
@@ -26,6 +26,7 @@
 #include "../res_descriptor.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class LiquidData : public WorldObjData
@@ -60,6 +61,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: prefab_obj_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/prefab_obj_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- prefab_obj_data.cxx 19 Apr 2003 10:23:19 -0000      1.12
+++ prefab_obj_data.cxx 18 Oct 2003 23:17:28 -0000      1.13
@@ -24,6 +24,7 @@
 #include "../pingus_error.hxx"
 #include "prefab_obj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 PrefabObjData::PrefabObjData (xmlDocPtr doc, xmlNodePtr cur)
@@ -67,5 +68,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: prefab_obj_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/prefab_obj_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- prefab_obj_data.hxx 19 Apr 2003 10:23:19 -0000      1.9
+++ prefab_obj_data.hxx 18 Oct 2003 23:17:28 -0000      1.10
@@ -25,6 +25,8 @@
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
+
 class Prefab;
 
 namespace WorldObjsData {
@@ -68,6 +70,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: rain_generator_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/rain_generator_data.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rain_generator_data.cxx     5 Mar 2003 19:13:59 -0000       1.6
+++ rain_generator_data.cxx     18 Oct 2003 23:17:28 -0000      1.7
@@ -24,6 +24,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "rain_generator_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 void
@@ -45,5 +46,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: rain_generator_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/rain_generator_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rain_generator_data.hxx     19 Apr 2003 10:23:19 -0000      1.7
+++ rain_generator_data.hxx     18 Oct 2003 23:17:28 -0000      1.8
@@ -23,6 +23,7 @@
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 /** */
@@ -42,6 +43,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: smasher_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/smasher_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- smasher_data.cxx    5 Mar 2003 19:13:59 -0000       1.11
+++ smasher_data.cxx    18 Oct 2003 23:17:28 -0000      1.12
@@ -27,6 +27,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "../pingus_resource.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 SmasherData::SmasherData ()
@@ -66,5 +67,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: smasher_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/smasher_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smasher_data.hxx    19 Apr 2003 10:23:19 -0000      1.8
+++ smasher_data.hxx    18 Oct 2003 23:17:28 -0000      1.9
@@ -21,10 +21,11 @@
 #define HEADER_PINGUS_WORLDOBJSDATA_SMASHER_DATA_HXX
 
 #include "../vector.hxx"
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class SmasherData : public WorldObjData {
@@ -49,6 +50,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: snow_generator_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/snow_generator_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- snow_generator_data.cxx     5 Mar 2003 19:13:59 -0000       1.8
+++ snow_generator_data.cxx     18 Oct 2003 23:17:28 -0000      1.9
@@ -25,6 +25,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "snow_generator_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 SnowGeneratorData::SnowGeneratorData(xmlDocPtr doc, xmlNodePtr cur)
@@ -57,5 +58,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: snow_generator_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/snow_generator_data.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- snow_generator_data.hxx     19 Apr 2003 10:23:19 -0000      1.10
+++ snow_generator_data.hxx     18 Oct 2003 23:17:28 -0000      1.11
@@ -23,6 +23,7 @@
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 /** */
@@ -43,6 +44,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: solid_color_background_data.cxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjsdata/solid_color_background_data.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- solid_color_background_data.cxx     5 Mar 2003 19:13:59 -0000       1.7
+++ solid_color_background_data.cxx     18 Oct 2003 23:17:28 -0000      1.8
@@ -26,6 +26,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "solid_color_background_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 SolidColorBackgroundData::SolidColorBackgroundData (xmlDocPtr doc, xmlNodePtr 
cur)
@@ -63,5 +64,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: solid_color_background_data.hxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjsdata/solid_color_background_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- solid_color_background_data.hxx     19 Apr 2003 10:23:19 -0000      1.7
+++ solid_color_background_data.hxx     18 Oct 2003 23:17:28 -0000      1.8
@@ -25,6 +25,7 @@
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class SolidColorBackgroundData : public WorldObjData
@@ -53,6 +54,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: spike_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/spike_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- spike_data.cxx      25 Mar 2003 23:15:23 -0000      1.12
+++ spike_data.cxx      18 Oct 2003 23:17:28 -0000      1.13
@@ -27,6 +27,7 @@
 #include "../pingus_resource.hxx"
 #include "../editor/editorobj_mgr.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 SpikeData::SpikeData ()
@@ -68,5 +69,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: spike_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/spike_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- spike_data.hxx      19 Apr 2003 10:23:19 -0000      1.9
+++ spike_data.hxx      18 Oct 2003 23:17:28 -0000      1.10
@@ -21,11 +21,12 @@
 #define HEADER_PINGUS_WORLDOBJSDATA_SPIKE_DATA_HXX
 
 #include "../vector.hxx"
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../game_counter.hxx"
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class SpikeData : public WorldObjData
@@ -52,6 +53,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus {
 
 #endif
 

Index: starfield_background_data.cxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjsdata/starfield_background_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- starfield_background_data.cxx       17 Jun 2003 14:09:20 -0000      1.11
+++ starfield_background_data.cxx       18 Oct 2003 23:17:28 -0000      1.12
@@ -25,6 +25,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "starfield_background_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 StarfieldBackgroundData::StarfieldBackgroundData ()
@@ -79,5 +80,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: starfield_background_data.hxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjsdata/starfield_background_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- starfield_background_data.hxx       19 Apr 2003 10:23:19 -0000      1.6
+++ starfield_background_data.hxx       18 Oct 2003 23:17:28 -0000      1.7
@@ -23,6 +23,7 @@
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class StarfieldBackgroundData : public WorldObjData
@@ -46,6 +47,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: surface_background_data.cxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjsdata/surface_background_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- surface_background_data.cxx 19 Apr 2003 10:23:19 -0000      1.12
+++ surface_background_data.cxx 18 Oct 2003 23:17:28 -0000      1.13
@@ -26,6 +26,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "surface_background_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 SurfaceBackgroundData::SurfaceBackgroundData ()
@@ -116,5 +117,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: surface_background_data.hxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjsdata/surface_background_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- surface_background_data.hxx 19 Apr 2003 10:23:19 -0000      1.8
+++ surface_background_data.hxx 18 Oct 2003 23:17:28 -0000      1.9
@@ -26,6 +26,7 @@
 #include "../res_descriptor.hxx"
 #include "../libxmlfwd.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class SurfaceBackgroundData : public WorldObjData
@@ -83,6 +84,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: switch_door_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/switch_door_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- switch_door_data.cxx        19 Apr 2003 10:23:19 -0000      1.12
+++ switch_door_data.cxx        18 Oct 2003 23:17:28 -0000      1.13
@@ -26,6 +26,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "switch_door_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 SwitchDoorData::SwitchDoorData ()
@@ -85,5 +86,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: switch_door_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/switch_door_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- switch_door_data.hxx        19 Apr 2003 10:23:19 -0000      1.8
+++ switch_door_data.hxx        18 Oct 2003 23:17:28 -0000      1.9
@@ -24,6 +24,7 @@
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 /** A variable height door which can block the way and which can be
@@ -59,6 +60,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: teleporter_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/teleporter_data.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- teleporter_data.cxx 19 Apr 2003 10:23:19 -0000      1.13
+++ teleporter_data.cxx 18 Oct 2003 23:17:28 -0000      1.14
@@ -26,6 +26,8 @@
 #include "../editorobjs/teleporter_target_obj.hxx"
 #include "../worldobjs/teleporter.hxx"
 #include "../editor/editorobj_mgr.hxx"
+
+namespace Pingus {
 namespace WorldObjsData {
 
 TeleporterData::TeleporterData ()
@@ -76,5 +78,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: teleporter_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/teleporter_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- teleporter_data.hxx 19 Apr 2003 10:23:19 -0000      1.8
+++ teleporter_data.hxx 18 Oct 2003 23:17:28 -0000      1.9
@@ -25,6 +25,7 @@
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class TeleporterData : public WorldObjData
@@ -52,6 +53,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: thunderstorm_background_data.cxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- thunderstorm_background_data.cxx    5 Mar 2003 19:13:59 -0000       1.7
+++ thunderstorm_background_data.cxx    18 Oct 2003 23:17:28 -0000      1.8
@@ -26,6 +26,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "thunderstorm_background_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 void
@@ -60,5 +61,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: thunderstorm_background_data.hxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- thunderstorm_background_data.hxx    19 Apr 2003 10:23:19 -0000      1.7
+++ thunderstorm_background_data.hxx    18 Oct 2003 23:17:28 -0000      1.8
@@ -24,6 +24,7 @@
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 class ThunderstormBackgroundData : public WorldObjData
@@ -49,6 +50,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif
 

Index: worldobj_group_data.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/worldobj_group_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- worldobj_group_data.cxx     19 Apr 2003 10:23:19 -0000      1.12
+++ worldobj_group_data.cxx     18 Oct 2003 23:17:28 -0000      1.13
@@ -25,6 +25,7 @@
 #include "../editor/editorobj_mgr.hxx"
 #include "worldobj_group_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 WorldObjGroupData::WorldObjGroupData ()
@@ -103,5 +104,6 @@
 }
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 /* EOF */

Index: worldobj_group_data.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjsdata/worldobj_group_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- worldobj_group_data.hxx     19 Apr 2003 10:23:19 -0000      1.8
+++ worldobj_group_data.hxx     18 Oct 2003 23:17:28 -0000      1.9
@@ -23,6 +23,7 @@
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
+namespace Pingus {
 namespace WorldObjsData {
 
 /** */
@@ -54,6 +55,7 @@
 };
 
 } // namespace WorldObjsData
+} // namespace Pingus
 
 #endif