pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src/worldobjs Makefile.am, 1.19, 1.20 bum


From: Ingo Ruhnke
Subject: [Pingus-CVS] CVS: Games/Pingus/src/worldobjs Makefile.am, 1.19, 1.20 bumper.cxx, 1.14, 1.15 conveyor_belt.cxx, 1.23, 1.24 conveyor_belt.hxx, 1.18, 1.19 fake_exit.cxx, 1.14, 1.15 groundpiece.cxx, 1.3, 1.4 guillotine.cxx, 1.9, 1.10 hammer.cxx, 1.13, 1.14 hotspot.cxx, 1.7, 1.8 ice_block.cxx, 1.22, 1.23 info_box.cxx, 1.21, 1.22 info_box.hxx, 1.16, 1.17 laser_exit.cxx, 1.13, 1.14 laser_exit.hxx, 1.7, 1.8 liquid.cxx, 1.9, 1.10 liquid.hxx, 1.6, 1.7 rain_generator.cxx, 1.11, 1.12 rain_generator.hxx, 1.7, 1.8 smasher.cxx, 1.19, 1.20 smasher.hxx, 1.8, 1.9 solid_color_background.cxx, 1.5, 1.6 spike.cxx, 1.10, 1.11 starfield_background_stars.hxx, 1.7, 1.8 switch_door.cxx, 1.24, 1.25 switch_door.hxx, 1.20, 1.21 teleporter.cxx, 1.17, 1.18 teleporter.hxx, 1.18, 1.19 thunderstorm_background.cxx, 1.5, 1.6 thunderstorm_background.hxx, 1.8, 1.9
Date: Sun, 19 Oct 2003 14:25:50 +0200

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

Modified Files:
        Makefile.am bumper.cxx conveyor_belt.cxx conveyor_belt.hxx 
        fake_exit.cxx groundpiece.cxx guillotine.cxx hammer.cxx 
        hotspot.cxx ice_block.cxx info_box.cxx info_box.hxx 
        laser_exit.cxx laser_exit.hxx liquid.cxx liquid.hxx 
        rain_generator.cxx rain_generator.hxx smasher.cxx smasher.hxx 
        solid_color_background.cxx spike.cxx 
        starfield_background_stars.hxx switch_door.cxx switch_door.hxx 
        teleporter.cxx teleporter.hxx thunderstorm_background.cxx 
        thunderstorm_background.hxx 
Log Message:
- some more stuff, still not much useable

Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.am 18 Oct 2003 12:11:31 -0000      1.19
+++ Makefile.am 19 Oct 2003 12:25:47 -0000      1.20
@@ -48,4 +48,4 @@
         teleporter.cxx                 teleporter.hxx                 \
        thunderstorm_background.cxx    thunderstorm_background.hxx
 
-## EOF ##
\ No newline at end of file
+## EOF ##

Index: bumper.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/bumper.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bumper.cxx  18 Oct 2003 23:17:28 -0000      1.14
+++ bumper.cxx  19 Oct 2003 12:25:47 -0000      1.15
@@ -28,6 +28,7 @@
 #include "../worldobjsdata/bumper_data.hxx"
 #include "bumper.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Bumper::Bumper (const WorldObjsData::BumperData& data_)
@@ -105,5 +106,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: conveyor_belt.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- conveyor_belt.cxx   19 Apr 2003 10:23:19 -0000      1.23
+++ conveyor_belt.cxx   19 Oct 2003 12:25:47 -0000      1.24
@@ -26,6 +26,7 @@
 #include "../worldobjsdata/conveyor_belt_data.hxx"
 #include "conveyor_belt.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 ConveyorBelt::ConveyorBelt (const WorldObjsData::ConveyorBeltData& data_)
@@ -95,5 +96,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: conveyor_belt.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/conveyor_belt.hxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- conveyor_belt.hxx   18 Oct 2003 23:17:28 -0000      1.18
+++ conveyor_belt.hxx   19 Oct 2003 12:25:47 -0000      1.19
@@ -25,6 +25,8 @@
 #include "../worldobj_data.hxx"
 #include "../editor/rect_editorobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class ConveyorBeltData;
 }
@@ -54,6 +56,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: fake_exit.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/fake_exit.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- fake_exit.cxx       19 Apr 2003 10:23:19 -0000      1.14
+++ fake_exit.cxx       19 Oct 2003 12:25:47 -0000      1.15
@@ -25,6 +25,7 @@
 #include "../smallmap.hxx"
 #include "fake_exit.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 FakeExit::FakeExit (const WorldObjsData::FakeExitData& data_)
@@ -103,5 +104,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: groundpiece.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/groundpiece.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- groundpiece.cxx     27 Sep 2002 18:36:41 -0000      1.3
+++ groundpiece.cxx     19 Oct 2003 12:25:47 -0000      1.4
@@ -24,6 +24,7 @@
 #include "../worldobjsdata/groundpiece_data.hxx"
 #include "groundpiece.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Groundpiece::Groundpiece (const WorldObjsData::GroundpieceData& data_)
@@ -56,5 +57,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: guillotine.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/guillotine.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- guillotine.cxx      19 Apr 2003 10:23:19 -0000      1.9
+++ guillotine.cxx      19 Oct 2003 12:25:47 -0000      1.10
@@ -24,6 +24,7 @@
 #include "../worldobjsdata/guillotine_data.hxx"
 #include "guillotine.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Guillotine::Guillotine (const WorldObjsData::GuillotineData& data_)
@@ -101,6 +102,6 @@
 }
 
 } // namespace WorldObjs
-
+} // namespace Pingus
 
 /* EOF */

Index: hammer.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/hammer.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hammer.cxx  19 Apr 2003 10:23:19 -0000      1.13
+++ hammer.cxx  19 Oct 2003 12:25:47 -0000      1.14
@@ -24,6 +24,7 @@
 #include "../worldobjsdata/hammer_data.hxx"
 #include "hammer.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Hammer::Hammer (const WorldObjsData::HammerData& data_)
@@ -73,5 +74,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: hotspot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/hotspot.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hotspot.cxx 19 Apr 2003 10:23:19 -0000      1.7
+++ hotspot.cxx 19 Oct 2003 12:25:47 -0000      1.8
@@ -23,6 +23,7 @@
 #include "../gui/graphic_context.hxx"
 #include "hotspot.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Hotspot::Hotspot (const WorldObjsData::HotspotData& data_)
@@ -58,5 +59,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: ice_block.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ice_block.cxx       19 Apr 2003 10:23:19 -0000      1.22
+++ ice_block.cxx       19 Oct 2003 12:25:47 -0000      1.23
@@ -28,6 +28,7 @@
 #include "../worldobjsdata/ice_block_data.hxx"
 #include "ice_block.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 IceBlock::IceBlock (const WorldObjsData::IceBlockData& data_)
@@ -101,5 +102,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: info_box.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- info_box.cxx        18 Oct 2003 23:17:28 -0000      1.21
+++ info_box.cxx        19 Oct 2003 12:25:47 -0000      1.22
@@ -27,6 +27,7 @@
 #include "../worldobjsdata/info_box_data.hxx"
 #include "info_box.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 InfoBox::InfoBox (const WorldObjsData::InfoBoxData& data_)
@@ -53,7 +54,7 @@
 
   if (is_open)
     {
-      int width = Fonts::pingus_small->get_text_width(data->info_text.c_str());
+      int width = Fonts::pingus_small.get_text_width(data->info_text.c_str());
       int border = 6;
       gc.draw_line(data->pos, data->pos + Vector(0, 0 - 100), 0.0f, 1.0f, 
0.0f, 1.0f);
       gc.draw(data->sprite, data->pos);
@@ -94,5 +95,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: info_box.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/info_box.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- info_box.hxx        19 Apr 2003 10:23:19 -0000      1.16
+++ info_box.hxx        19 Oct 2003 12:25:47 -0000      1.17
@@ -23,6 +23,8 @@
 #include "../worldobj.hxx"
 #include "../editor/sprite_editorobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class InfoBoxData;
 }
@@ -50,7 +52,7 @@
 };
 
 } // namespace WorldObjs
-
+} // namespace Pingus
 
 #endif
 

Index: laser_exit.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/laser_exit.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- laser_exit.cxx      18 Oct 2003 23:17:28 -0000      1.13
+++ laser_exit.cxx      19 Oct 2003 12:25:47 -0000      1.14
@@ -24,6 +24,7 @@
 #include "../worldobjsdata/laser_exit_data.hxx"
 #include "laser_exit.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 LaserExit::LaserExit (const WorldObjsData::LaserExitData& data_) 
@@ -91,5 +92,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

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

Index: liquid.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/liquid.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- liquid.cxx  19 Apr 2003 10:23:19 -0000      1.9
+++ liquid.cxx  19 Oct 2003 12:25:47 -0000      1.10
@@ -25,6 +25,7 @@
 #include "../worldobjsdata/liquid_data.hxx"
 #include "liquid.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Liquid::Liquid (const WorldObjsData::LiquidData& data_) :
@@ -74,5 +75,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: liquid.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/liquid.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- liquid.hxx  19 Apr 2003 10:23:19 -0000      1.6
+++ liquid.hxx  19 Oct 2003 12:25:47 -0000      1.7
@@ -23,6 +23,8 @@
 #include "../sprite.hxx"
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class LiquidData;
 }
@@ -52,6 +54,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: rain_generator.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/rain_generator.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- rain_generator.cxx  18 Oct 2003 23:17:28 -0000      1.11
+++ rain_generator.cxx  19 Oct 2003 12:25:47 -0000      1.12
@@ -25,6 +25,7 @@
 #include "../gui/graphic_context.hxx"
 #include "rain_generator.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 RainGenerator::RainGenerator ()
@@ -75,5 +76,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: rain_generator.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/rain_generator.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rain_generator.hxx  19 Apr 2003 10:23:19 -0000      1.7
+++ rain_generator.hxx  19 Oct 2003 12:25:47 -0000      1.8
@@ -22,6 +22,7 @@
 
 #include "../worldobj.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 class RainGenerator : public WorldObj
@@ -44,6 +45,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: smasher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- smasher.cxx 19 Apr 2003 10:23:19 -0000      1.19
+++ smasher.cxx 19 Oct 2003 12:25:47 -0000      1.20
@@ -30,6 +30,7 @@
 #include "../worldobjsdata/smasher_data.hxx"
 #include "smasher.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Smasher::Smasher (const WorldObjsData::SmasherData& data_)
@@ -149,5 +150,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: smasher.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/smasher.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smasher.hxx 19 Apr 2003 10:23:19 -0000      1.8
+++ smasher.hxx 19 Oct 2003 12:25:47 -0000      1.9
@@ -22,6 +22,8 @@
 
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class SmasherData;
 }
@@ -57,6 +59,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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- solid_color_background.cxx  18 Oct 2003 23:17:28 -0000      1.5
+++ solid_color_background.cxx  19 Oct 2003 12:25:47 -0000      1.6
@@ -18,9 +18,11 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Display/display.h>
+#include "../display.hxx"
 #include "../worldobjsdata/solid_color_background_data.hxx"
 #include "solid_color_background.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 SolidColorBackground::SolidColorBackground (const 
WorldObjsData::SolidColorBackgroundData& data_)
@@ -37,12 +39,11 @@
 SolidColorBackground::draw (GraphicContext& gc)
 {
   // FIXME: should use GraphicContext, not CL_Display
-  CL_Display::clear(data->color.red, data->color.green, data->color.blue, 
data->color.alpha);
+  CL_Display::clear(Display::to_color(data->color.red, data->color.green, 
data->color.blue, data->color.alpha));
   UNUSED_ARG(gc);
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */
-
-

Index: spike.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/spike.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- spike.cxx   19 Apr 2003 10:23:19 -0000      1.10
+++ spike.cxx   19 Oct 2003 12:25:47 -0000      1.11
@@ -24,6 +24,7 @@
 #include "../worldobjsdata/spike_data.hxx"
 #include "spike.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Spike::Spike (const WorldObjsData::SpikeData& data_)
@@ -95,5 +96,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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- starfield_background_stars.hxx      18 Oct 2003 23:17:28 -0000      1.7
+++ starfield_background_stars.hxx      19 Oct 2003 12:25:47 -0000      1.8
@@ -23,6 +23,7 @@
 #include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 class StarfieldBackgroundStars
@@ -55,6 +56,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: switch_door.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- switch_door.cxx     19 Apr 2003 10:23:19 -0000      1.24
+++ switch_door.cxx     19 Oct 2003 12:25:47 -0000      1.25
@@ -26,6 +26,7 @@
 #include "../pingus_resource.hxx"
 #include "switch_door.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 SwitchDoor::SwitchDoor (const WorldObjsData::SwitchDoorData& data_)
@@ -121,5 +122,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: switch_door.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/switch_door.hxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- switch_door.hxx     18 Oct 2003 23:17:28 -0000      1.20
+++ switch_door.hxx     19 Oct 2003 12:25:47 -0000      1.21
@@ -23,6 +23,8 @@
 #include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class SwitchDoorData;
 } // namespace WorldObjsData
@@ -65,6 +67,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: teleporter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/teleporter.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- teleporter.cxx      19 Apr 2003 10:23:19 -0000      1.17
+++ teleporter.cxx      19 Oct 2003 12:25:47 -0000      1.18
@@ -25,6 +25,7 @@
 #include "../worldobjsdata/teleporter_data.hxx"
 #include "teleporter.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 Teleporter::Teleporter (const WorldObjsData::TeleporterData& data_)
@@ -79,5 +80,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: teleporter.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/teleporter.hxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- teleporter.hxx      19 Apr 2003 10:23:19 -0000      1.18
+++ teleporter.hxx      19 Oct 2003 12:25:47 -0000      1.19
@@ -22,6 +22,8 @@
 
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class TeleporterData;
 }
@@ -51,6 +53,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 

Index: thunderstorm_background.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/thunderstorm_background.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- thunderstorm_background.cxx 19 Feb 2003 09:50:37 -0000      1.5
+++ thunderstorm_background.cxx 19 Oct 2003 12:25:47 -0000      1.6
@@ -22,6 +22,7 @@
 #include "../gui/graphic_context.hxx"
 #include "thunderstorm_background.hxx"
 
+namespace Pingus {
 namespace WorldObjs {
 
 ThunderstormBackground::ThunderstormBackground (const 
WorldObjsData::ThunderstormBackgroundData& data_)
@@ -59,5 +60,6 @@
 }
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 /* EOF */

Index: thunderstorm_background.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/thunderstorm_background.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- thunderstorm_background.hxx 18 Oct 2003 23:17:28 -0000      1.8
+++ thunderstorm_background.hxx 19 Oct 2003 12:25:47 -0000      1.9
@@ -23,6 +23,8 @@
 #include <ClanLib/Display/surface.h>
 #include "../worldobj.hxx"
 
+namespace Pingus {
+
 namespace WorldObjsData {
 class ThunderstormBackgroundData;
 }
@@ -52,6 +54,7 @@
 };
 
 } // namespace WorldObjs
+} // namespace Pingus
 
 #endif
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]