[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx, 1.10, 1.11
From: |
Ingo Ruhnke |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx, 1.10, 1.11 bumper_obj.hxx, 1.10, 1.11 conveyor_belt_obj.cxx, 1.8, 1.9 conveyor_belt_obj.hxx, 1.8, 1.9 entrance_obj.hxx, 1.4, 1.5 exit_obj.cxx, 1.2, 1.3 exit_obj.hxx, 1.3, 1.4 fake_exit_obj.cxx, 1.11, 1.12 fake_exit_obj.hxx, 1.11, 1.12 groundpiece_obj.cxx, 1.15, 1.16 groundpiece_obj.hxx, 1.5, 1.6 guillotine_obj.cxx, 1.10, 1.11 guillotine_obj.hxx, 1.10, 1.11 hammer_obj.cxx, 1.11, 1.12 hammer_obj.hxx, 1.10, 1.11 hotspot_obj.cxx, 1.3, 1.4 hotspot_obj.hxx, 1.6, 1.7 ice_block_obj.cxx, 1.7, 1.8 ice_block_obj.hxx, 1.6, 1.7 info_box_obj.cxx, 1.5, 1.6 info_box_obj.hxx, 1.7, 1.8 laser_exit_obj.cxx, 1.11, 1.12 laser_exit_obj.hxx, 1.10, 1.11 liquid_obj.cxx, 1.6, 1.7 liquid_obj.hxx, 1.6, 1.7 prefab_obj.cxx, 1.1, 1.2 prefab_obj.hxx, 1.4, 1.5 smasher_obj.cxx, 1.9, 1.10 smasher_obj.hxx, 1.11, 1.12 solid_color_background_obj.cxx, 1.7, 1.8 solid_color_background_obj.hxx, 1.7, 1.8 spike_obj.cxx, 1.11, 1.12 spike_obj.hxx, 1.11, 1.12 starfield_background_obj.cxx, 1.6, 1.7 starfield_background_obj.hxx, 1.7, 1.8 surface_background_obj.cxx, 1.10, 1.11 surface_background_obj.hxx, 1.7, 1.8 switch_door_obj.cxx, 1.8, 1.9 switch_door_obj.hxx, 1.8, 1.9 switch_door_switch_obj.cxx, 1.3, 1.4 switch_door_switch_obj.hxx, 1.5, 1.6 teleporter_obj.hxx, 1.10, 1.11 teleporter_target_obj.hxx, 1.5, 1.6 thunderstorm_background_obj.cxx, 1.3, 1.4 thunderstorm_background_obj.hxx, 1.5, 1.6 |
Date: |
Sun, 19 Oct 2003 01:17:31 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/editorobjs
In directory dark:/tmp/cvs-serv4053/editorobjs
Modified Files:
bumper_obj.cxx bumper_obj.hxx conveyor_belt_obj.cxx
conveyor_belt_obj.hxx entrance_obj.hxx exit_obj.cxx
exit_obj.hxx fake_exit_obj.cxx fake_exit_obj.hxx
groundpiece_obj.cxx groundpiece_obj.hxx guillotine_obj.cxx
guillotine_obj.hxx hammer_obj.cxx hammer_obj.hxx
hotspot_obj.cxx hotspot_obj.hxx ice_block_obj.cxx
ice_block_obj.hxx info_box_obj.cxx info_box_obj.hxx
laser_exit_obj.cxx laser_exit_obj.hxx liquid_obj.cxx
liquid_obj.hxx prefab_obj.cxx prefab_obj.hxx smasher_obj.cxx
smasher_obj.hxx solid_color_background_obj.cxx
solid_color_background_obj.hxx spike_obj.cxx spike_obj.hxx
starfield_background_obj.cxx starfield_background_obj.hxx
surface_background_obj.cxx surface_background_obj.hxx
switch_door_obj.cxx switch_door_obj.hxx
switch_door_switch_obj.cxx switch_door_switch_obj.hxx
teleporter_obj.hxx teleporter_target_obj.hxx
thunderstorm_background_obj.cxx
thunderstorm_background_obj.hxx
Log Message:
- bunch of little fixes for CL0.7, some parts are compilable, but still a bit
more todo
Index: bumper_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/bumper_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- bumper_obj.cxx 19 Apr 2003 10:23:18 -0000 1.10
+++ bumper_obj.cxx 18 Oct 2003 23:17:27 -0000 1.11
@@ -22,8 +22,11 @@
#include "../editor/editor_view.hxx"
#include "../worldobjsdata/bumper_data.hxx"
+namespace Pingus {
namespace EditorObjs {
+using namespace EditorNS;
+
BumperObj::BumperObj (const WorldObjsData::BumperData& data_)
: data(new WorldObjsData::BumperData(data_)),
frame(0)
@@ -40,7 +43,7 @@
delete data;
}
-EditorObjLst
+EditorNS::EditorObjLst
BumperObj::create (const Vector& pos)
{
WorldObjsData::BumperData newdata;
@@ -48,7 +51,7 @@
return EditorObjLst(1, new BumperObj(newdata));
}
-EditorObj*
+EditorNS::EditorObj*
BumperObj::duplicate ()
{
return new BumperObj(*data);
@@ -75,5 +78,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: bumper_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/bumper_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- bumper_obj.hxx 19 Apr 2003 10:23:18 -0000 1.10
+++ bumper_obj.hxx 18 Oct 2003 23:17:27 -0000 1.11
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
- class BumperData;
+class BumperData;
}
namespace EditorObjs {
-class BumperObj : public SpriteEditorObj
+class BumperObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::BumperData* const data;
@@ -38,7 +40,7 @@
BumperObj (const WorldObjsData::BumperData& data_);
~BumperObj ();
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
EditorObj* duplicate ();
@@ -53,6 +55,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: conveyor_belt_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/conveyor_belt_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- conveyor_belt_obj.cxx 19 Apr 2003 10:23:18 -0000 1.8
+++ conveyor_belt_obj.cxx 18 Oct 2003 23:17:27 -0000 1.9
@@ -26,6 +26,7 @@
#include "../worldobjsdata/conveyor_belt_data.hxx"
#include "conveyor_belt_obj.hxx"
+namespace Pingus {
namespace EditorObjs {
ConveyorBeltObj::ConveyorBeltObj (const WorldObjsData::ConveyorBeltData& data_)
@@ -36,7 +37,7 @@
{
}
-EditorObj*
+EditorNS::EditorObj*
ConveyorBeltObj::duplicate ()
{
return new ConveyorBeltObj(*data);
@@ -77,7 +78,7 @@
UNUSED_ARG(arg_height);
}
-EditorObjLst
+EditorNS::EditorObjLst
ConveyorBeltObj::create (const Vector& pos)
{
WorldObjsData::ConveyorBeltData newdata;
@@ -156,5 +157,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: conveyor_belt_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/conveyor_belt_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- conveyor_belt_obj.hxx 19 Apr 2003 10:23:18 -0000 1.8
+++ conveyor_belt_obj.hxx 18 Oct 2003 23:17:27 -0000 1.9
@@ -20,9 +20,11 @@
#ifndef HEADER_PINGUS_EDITOROBJS_CONVEYOR_BELT_OBJ_HXX
#define HEADER_PINGUS_EDITOROBJS_CONVEYOR_BELT_OBJ_HXX
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
#include "../editor/rect_editorobj.hxx"
+namespace Pingus {
+
class WorldObjData;
namespace WorldObjsData {
@@ -31,7 +33,7 @@
namespace EditorObjs {
-class ConveyorBeltObj : public RectEditorObj
+class ConveyorBeltObj : public EditorNS::RectEditorObj
{
private:
WorldObjsData::ConveyorBeltData* const data;
@@ -43,7 +45,7 @@
public:
ConveyorBeltObj (const WorldObjsData::ConveyorBeltData& data_);
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
void draw (EditorNS::EditorView * view);
void draw_scroll_map (int x_pos, int y_pos, int arg_width, int arg_height);
@@ -55,10 +57,10 @@
void set_position_offset (const Vector &);
- static EditorObjLst create (WorldObjData* obj);
+ static EditorNS::EditorObjLst create (WorldObjData* obj);
/** Create the object with reasonable defaults */
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
Vector get_upper_left_corner ();
@@ -75,6 +77,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus {
#endif
Index: entrance_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/entrance_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- entrance_obj.hxx 19 Apr 2003 10:23:18 -0000 1.4
+++ entrance_obj.hxx 18 Oct 2003 23:17:27 -0000 1.5
@@ -23,9 +23,10 @@
#include "../editor/sprite_editorobj.hxx"
#include "../worldobjsdata/entrance_data.hxx"
+namespace Pingus {
namespace EditorObjs {
-class EntranceObj : public SpriteEditorObj
+class EntranceObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::EntranceData* const data;
@@ -48,6 +49,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: exit_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/exit_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exit_obj.cxx 19 Apr 2003 10:23:18 -0000 1.2
+++ exit_obj.cxx 18 Oct 2003 23:17:27 -0000 1.3
@@ -21,6 +21,7 @@
#include "../worldobjsdata/exit_data.hxx"
#include "exit_obj.hxx"
+namespace Pingus {
namespace EditorObjs {
ExitObj::ExitObj (const WorldObjsData::ExitData& data_)
@@ -67,5 +68,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus {
/* EOF */
Index: exit_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/exit_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exit_obj.hxx 19 Apr 2003 10:23:18 -0000 1.3
+++ exit_obj.hxx 18 Oct 2003 23:17:27 -0000 1.4
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class ExitData;
}
namespace EditorObjs {
-class ExitObj : public SpriteEditorObj
+class ExitObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::ExitData* const data;
@@ -49,6 +51,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus {
#endif
Index: fake_exit_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/fake_exit_obj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fake_exit_obj.cxx 19 Apr 2003 10:23:18 -0000 1.11
+++ fake_exit_obj.cxx 18 Oct 2003 23:17:28 -0000 1.12
@@ -22,6 +22,7 @@
#include "../editor/editor_view.hxx"
#include "../worldobjsdata/fake_exit_data.hxx"
+namespace Pingus {
namespace EditorObjs {
FakeExitObj::FakeExitObj (const WorldObjsData::FakeExitData& data_)
@@ -75,5 +76,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: fake_exit_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/fake_exit_obj.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fake_exit_obj.hxx 19 Apr 2003 10:23:18 -0000 1.11
+++ fake_exit_obj.hxx 18 Oct 2003 23:17:28 -0000 1.12
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class FakeExitData;
}
namespace EditorObjs {
-class FakeExitObj : public SpriteEditorObj
+class FakeExitObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::FakeExitData* const data;
@@ -38,7 +40,7 @@
FakeExitObj (const WorldObjsData::FakeExitData& data_);
~FakeExitObj ();
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
EditorObj* duplicate ();
@@ -53,6 +55,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: groundpiece_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/groundpiece_obj.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- groundpiece_obj.cxx 19 Apr 2003 10:23:18 -0000 1.15
+++ groundpiece_obj.cxx 18 Oct 2003 23:17:28 -0000 1.16
@@ -26,6 +26,7 @@
#include "../groundtype.hxx"
#include "groundpiece_obj.hxx"
+namespace Pingus {
namespace EditorObjs {
GroundpieceObj::GroundpieceObj (const WorldObjsData::GroundpieceData& data_)
@@ -166,5 +167,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: groundpiece_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/groundpiece_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- groundpiece_obj.hxx 19 Apr 2003 10:23:18 -0000 1.5
+++ groundpiece_obj.hxx 18 Oct 2003 23:17:28 -0000 1.6
@@ -23,6 +23,8 @@
#include "../editor/sprite_editorobj.hxx"
#include "../groundtype.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class GroundpieceData;
}
@@ -33,7 +35,7 @@
namespace EditorObjs {
-class GroundpieceObj : public SpriteEditorObj
+class GroundpieceObj : public EditorNS::SpriteEditorObj
{
friend class EditorNS::GroundpieceWindow;
private:
@@ -57,7 +59,7 @@
void write_xml (std::ostream& xml);
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
std::string status_line ();
EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent);
@@ -68,6 +70,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: guillotine_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/guillotine_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- guillotine_obj.cxx 19 Apr 2003 10:23:18 -0000 1.10
+++ guillotine_obj.cxx 18 Oct 2003 23:17:28 -0000 1.11
@@ -22,6 +22,7 @@
#include "../editor/editor_view.hxx"
#include "../worldobjsdata/guillotine_data.hxx"
+namespace Pingus {
namespace EditorObjs {
GuillotineObj::GuillotineObj (const WorldObjsData::GuillotineData& data_)
@@ -73,5 +74,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: guillotine_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/guillotine_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- guillotine_obj.hxx 19 Apr 2003 10:23:18 -0000 1.10
+++ guillotine_obj.hxx 18 Oct 2003 23:17:28 -0000 1.11
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class GuillotineData;
}
namespace EditorObjs {
-class GuillotineObj : public SpriteEditorObj
+class GuillotineObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::GuillotineData* const data;
@@ -38,9 +40,9 @@
GuillotineObj (const WorldObjsData::GuillotineData& data_);
~GuillotineObj ();
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
void write_xml (std::ostream& xml);
void draw (EditorNS::EditorView* view);
@@ -53,6 +55,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: hammer_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/hammer_obj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hammer_obj.cxx 19 Apr 2003 10:23:18 -0000 1.11
+++ hammer_obj.cxx 18 Oct 2003 23:17:28 -0000 1.12
@@ -22,6 +22,7 @@
#include "../editor/editor_view.hxx"
#include "../worldobjsdata/hammer_data.hxx"
+namespace Pingus {
namespace EditorObjs {
HammerObj::HammerObj (const WorldObjsData::HammerData& data_)
@@ -38,18 +39,18 @@
delete data;
}
-EditorObj*
+EditorNS::EditorObj*
HammerObj::duplicate ()
{
return new HammerObj(*data);
}
-EditorObjLst
+EditorNS::EditorObjLst
HammerObj::create (const Vector& pos)
{
WorldObjsData::HammerData hammer_data;
hammer_data.pos = pos;
- return EditorObjLst(1, new HammerObj(hammer_data));
+ return EditorNS::EditorObjLst(1, new HammerObj(hammer_data));
}
void
@@ -73,5 +74,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: hammer_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/hammer_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hammer_obj.hxx 19 Apr 2003 10:23:18 -0000 1.10
+++ hammer_obj.hxx 18 Oct 2003 23:17:28 -0000 1.11
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class HammerData;
} // namespace WorldObjsData
namespace EditorObjs {
-class HammerObj : public SpriteEditorObj
+class HammerObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::HammerData* const data;
@@ -38,9 +40,9 @@
HammerObj (const WorldObjsData::HammerData& data_);
~HammerObj ();
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
void write_xml (std::ostream& xml);
void draw (EditorNS::EditorView* view);
@@ -53,6 +55,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: hotspot_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/hotspot_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hotspot_obj.cxx 19 Apr 2003 10:23:18 -0000 1.3
+++ hotspot_obj.cxx 18 Oct 2003 23:17:28 -0000 1.4
@@ -21,6 +21,7 @@
#include "../string_converter.hxx"
#include "hotspot_obj.hxx"
+namespace Pingus {
namespace EditorObjs {
HotspotObj::HotspotObj (const WorldObjsData::HotspotData& data_)
@@ -52,5 +53,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: hotspot_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/hotspot_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hotspot_obj.hxx 19 Apr 2003 10:23:18 -0000 1.6
+++ hotspot_obj.hxx 18 Oct 2003 23:17:28 -0000 1.7
@@ -23,13 +23,15 @@
#include "../editor/editor.hxx"
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class HotspotData;
}
namespace EditorObjs {
-class HotspotObj : public SpriteEditorObj
+class HotspotObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::HotspotData* const data;
@@ -49,6 +51,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: ice_block_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/ice_block_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ice_block_obj.cxx 19 Apr 2003 10:23:18 -0000 1.7
+++ ice_block_obj.cxx 18 Oct 2003 23:17:28 -0000 1.8
@@ -21,6 +21,7 @@
#include "../worldobjsdata/ice_block_data.hxx"
#include "ice_block_obj.hxx"
+namespace Pingus {
namespace EditorObjs {
IceBlockObj::IceBlockObj (const WorldObjsData::IceBlockData& data_)
@@ -65,5 +66,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: ice_block_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/ice_block_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ice_block_obj.hxx 19 Apr 2003 10:23:18 -0000 1.6
+++ ice_block_obj.hxx 18 Oct 2003 23:17:28 -0000 1.7
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class IceBlockData;
}
namespace EditorObjs {
-class IceBlockObj : public SpriteEditorObj
+class IceBlockObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::IceBlockData* const data;
@@ -38,7 +40,7 @@
~IceBlockObj ();
/** Create the object with resonable defaults */
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
void write_xml (std::ostream& xml);
@@ -51,6 +53,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: info_box_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/info_box_obj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- info_box_obj.cxx 19 Apr 2003 10:23:18 -0000 1.5
+++ info_box_obj.cxx 18 Oct 2003 23:17:28 -0000 1.6
@@ -20,6 +20,7 @@
#include "../worldobjsdata/info_box_data.hxx"
#include "info_box_obj.hxx"
+namespace Pingus {
namespace EditorObjs {
InfoBoxObj::InfoBoxObj (const WorldObjsData::InfoBoxData& data_)
@@ -61,5 +62,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: info_box_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/info_box_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- info_box_obj.hxx 19 Apr 2003 10:23:18 -0000 1.7
+++ info_box_obj.hxx 18 Oct 2003 23:17:28 -0000 1.8
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class InfoBoxData;
}
namespace EditorObjs {
-class InfoBoxObj : public SpriteEditorObj
+class InfoBoxObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::InfoBoxData* const data;
@@ -37,10 +39,10 @@
InfoBoxObj (const WorldObjsData::InfoBoxData& data_);
~InfoBoxObj ();
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
void write_xml (std::ostream& xml);
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
std::string status_line ();
EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
private:
@@ -49,6 +51,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: laser_exit_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/laser_exit_obj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- laser_exit_obj.cxx 19 Apr 2003 10:23:18 -0000 1.11
+++ laser_exit_obj.cxx 18 Oct 2003 23:17:28 -0000 1.12
@@ -22,6 +22,7 @@
#include "../editor/editor_view.hxx"
#include "../worldobjsdata/laser_exit_data.hxx"
+namespace Pingus {
namespace EditorObjs {
LaserExitObj::LaserExitObj (const WorldObjsData::LaserExitData& data_)
@@ -74,5 +75,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: laser_exit_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/laser_exit_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- laser_exit_obj.hxx 19 Apr 2003 10:23:18 -0000 1.10
+++ laser_exit_obj.hxx 18 Oct 2003 23:17:28 -0000 1.11
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class LaserExitData;
}
namespace EditorObjs {
-class LaserExitObj : public SpriteEditorObj
+class LaserExitObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::LaserExitData* const data;
@@ -38,22 +40,23 @@
LaserExitObj (const WorldObjsData::LaserExitData& data_);
~LaserExitObj ();
- static EditorObjLst create (const Vector& pos);
-
+ static EditorNS::EditorObjLst create (const Vector& pos);
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
void write_xml (std::ostream& xml);
void draw (EditorNS::EditorView* view);
std::string status_line ();
EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
+
private:
LaserExitObj (const LaserExitObj&);
LaserExitObj& operator= (const LaserExitObj&);
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: liquid_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/liquid_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- liquid_obj.cxx 19 Apr 2003 10:23:18 -0000 1.6
+++ liquid_obj.cxx 18 Oct 2003 23:17:28 -0000 1.7
@@ -24,6 +24,7 @@
#include "../editor/generic_property_frame.hxx"
#include "liquid_obj.hxx"
+namespace Pingus {
namespace EditorObjs {
LiquidObj::LiquidObj (const WorldObjsData::LiquidData& data_)
@@ -114,5 +115,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: liquid_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/liquid_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- liquid_obj.hxx 19 Apr 2003 10:23:18 -0000 1.6
+++ liquid_obj.hxx 18 Oct 2003 23:17:28 -0000 1.7
@@ -23,6 +23,8 @@
#include "../editor/sprite_editorobj.hxx"
#include "../worldobjsdata/liquid_data.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class LiquidData;
}
@@ -58,6 +60,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: prefab_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/prefab_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prefab_obj.cxx 15 Sep 2002 20:33:45 -0000 1.1
+++ prefab_obj.cxx 18 Oct 2003 23:17:28 -0000 1.2
@@ -19,6 +19,10 @@
#include "prefab_obj.hxx"
+namespace EditorObjs {
+namespace Pingus {
+} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: prefab_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/prefab_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prefab_obj.hxx 19 Apr 2003 10:23:18 -0000 1.4
+++ prefab_obj.hxx 18 Oct 2003 23:17:28 -0000 1.5
@@ -22,6 +22,8 @@
#include "../editor/editorobj.hxx"
+namespace Pingus {
+
class WorldObjGroup;
class PrefabObjData;
@@ -47,6 +49,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: smasher_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/smasher_obj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- smasher_obj.cxx 19 Apr 2003 10:23:18 -0000 1.9
+++ smasher_obj.cxx 18 Oct 2003 23:17:28 -0000 1.10
@@ -22,6 +22,7 @@
#include "../editor/editor_view.hxx"
#include "../worldobjsdata/smasher_data.hxx"
+namespace Pingus {
namespace EditorObjs {
SmasherObj::SmasherObj (const WorldObjsData::SmasherData& data_)
@@ -73,5 +74,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: smasher_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/smasher_obj.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- smasher_obj.hxx 19 Apr 2003 10:23:18 -0000 1.11
+++ smasher_obj.hxx 18 Oct 2003 23:17:28 -0000 1.12
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class SmasherData;
}
namespace EditorObjs {
-class SmasherObj : public SpriteEditorObj
+class SmasherObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::SmasherData* const data;
@@ -38,9 +40,9 @@
SmasherObj (const WorldObjsData::SmasherData& data_);
~SmasherObj ();
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
void write_xml (std::ostream& xml);
void draw (EditorNS::EditorView* view);
@@ -53,6 +55,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: solid_color_background_obj.cxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/solid_color_background_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- solid_color_background_obj.cxx 19 Apr 2003 10:23:18 -0000 1.7
+++ solid_color_background_obj.cxx 18 Oct 2003 23:17:28 -0000 1.8
@@ -29,6 +29,7 @@
using namespace EditorNS;
+namespace Pingus {
namespace EditorObjs {
SolidColorBackgroundObj::SolidColorBackgroundObj (const
WorldObjsData::SolidColorBackgroundData& data_)
@@ -108,5 +109,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus {
/* EOF */
Index: solid_color_background_obj.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/solid_color_background_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- solid_color_background_obj.hxx 19 Apr 2003 10:23:18 -0000 1.7
+++ solid_color_background_obj.hxx 18 Oct 2003 23:17:28 -0000 1.8
@@ -34,7 +34,7 @@
namespace EditorObjs {
-class SolidColorBackgroundObj : public RectEditorObj
+class SolidColorBackgroundObj : public EditorNS::RectEditorObj
{
private:
WorldObjsData::SolidColorBackgroundData* const data;
Index: spike_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/spike_obj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- spike_obj.cxx 19 Apr 2003 10:23:18 -0000 1.11
+++ spike_obj.cxx 18 Oct 2003 23:17:28 -0000 1.12
@@ -22,6 +22,7 @@
#include "../editor/editor_view.hxx"
#include "../worldobjsdata/spike_data.hxx"
+namespace Pingus {
namespace EditorObjs {
SpikeObj::SpikeObj (const WorldObjsData::SpikeData& data_)
@@ -72,5 +73,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: spike_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/spike_obj.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- spike_obj.hxx 19 Apr 2003 10:23:18 -0000 1.11
+++ spike_obj.hxx 18 Oct 2003 23:17:28 -0000 1.12
@@ -22,13 +22,15 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class SpikeData;
} // namespace WorldObjsData
namespace EditorObjs {
-class SpikeObj : public SpriteEditorObj
+class SpikeObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::SpikeData* const data;
@@ -37,10 +39,10 @@
SpikeObj (const WorldObjsData::SpikeData& data_);
~SpikeObj ();
- static EditorObjLst create (const Vector& pos);
-
- EditorObj* duplicate ();
+ static EditorNS::EditorObjLst create (const Vector& pos);
+ EditorNS::EditorObj* duplicate ();
+
void write_xml (std::ostream& xml);
void draw (EditorNS::EditorView* view);
@@ -52,6 +54,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: starfield_background_obj.cxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/starfield_background_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- starfield_background_obj.cxx 19 Apr 2003 10:23:18 -0000 1.6
+++ starfield_background_obj.cxx 18 Oct 2003 23:17:28 -0000 1.7
@@ -26,6 +26,7 @@
using namespace EditorNS;
+namespace Pingus {
namespace EditorObjs {
StarfieldBackgroundObj::StarfieldBackgroundObj (const
WorldObjsData::StarfieldBackgroundData& data_)
@@ -77,5 +78,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: starfield_background_obj.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/starfield_background_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- starfield_background_obj.hxx 19 Apr 2003 10:23:18 -0000 1.7
+++ starfield_background_obj.hxx 18 Oct 2003 23:17:28 -0000 1.8
@@ -24,6 +24,8 @@
#include "../string_converter.hxx"
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class StarfieldBackgroundData;
}
@@ -52,6 +54,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: surface_background_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/surface_background_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- surface_background_obj.cxx 19 Apr 2003 10:23:18 -0000 1.10
+++ surface_background_obj.cxx 18 Oct 2003 23:17:28 -0000 1.11
@@ -27,6 +27,7 @@
using namespace EditorNS;
+namespace Pingus {
namespace EditorObjs {
SurfaceBackgroundObj::SurfaceBackgroundObj (const
WorldObjsData::SurfaceBackgroundData& data_)
@@ -89,5 +90,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: surface_background_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/surface_background_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_background_obj.hxx 19 Apr 2003 10:23:18 -0000 1.7
+++ surface_background_obj.hxx 18 Oct 2003 23:17:28 -0000 1.8
@@ -22,6 +22,8 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class SurfaceBackgroundData;
}
@@ -50,6 +52,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: switch_door_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- switch_door_obj.cxx 19 Apr 2003 10:23:18 -0000 1.8
+++ switch_door_obj.cxx 18 Oct 2003 23:17:28 -0000 1.9
@@ -24,6 +24,7 @@
#include "../pingus_resource.hxx"
#include "../worldobjsdata/switch_door_data.hxx"
+namespace Pingus {
namespace EditorObjs {
SwitchDoorObj::SwitchDoorObj (const WorldObjsData::SwitchDoorData& data_)
@@ -144,5 +145,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: switch_door_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- switch_door_obj.hxx 19 Apr 2003 10:23:18 -0000 1.8
+++ switch_door_obj.hxx 18 Oct 2003 23:17:28 -0000 1.9
@@ -22,13 +22,15 @@
#include "switch_door_switch_obj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class SwitchDoorData;
} // namespace WorldObjsData
namespace EditorObjs {
-class SwitchDoorObj : public RectEditorObj
+class SwitchDoorObj : public EditorNS::RectEditorObj
{
private:
WorldObjsData::SwitchDoorData* const data;
@@ -46,9 +48,9 @@
/** Create this object (and child objects) with reasonable defaults
for the editor */
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
- EditorObj* duplicate();
+ EditorNS::EditorObj* duplicate();
float get_z_pos ();
int get_width ();
@@ -72,6 +74,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: switch_door_switch_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_switch_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- switch_door_switch_obj.cxx 19 Apr 2003 10:23:18 -0000 1.3
+++ switch_door_switch_obj.cxx 18 Oct 2003 23:17:28 -0000 1.4
@@ -20,6 +20,7 @@
#include "switch_door_obj.hxx"
#include "../worldobjsdata/switch_door_data.hxx"
+namespace Pingus {
namespace EditorObjs {
SwitchDoorSwitchObj::SwitchDoorSwitchObj (SwitchDoorObj* data)
@@ -42,5 +43,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: switch_door_switch_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_switch_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- switch_door_switch_obj.hxx 19 Apr 2003 10:23:18 -0000 1.5
+++ switch_door_switch_obj.hxx 18 Oct 2003 23:17:28 -0000 1.6
@@ -22,21 +22,22 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
namespace EditorObjs {
class SwitchDoorObj;
/** A dummy object to represent the switch for a switchdoor, all real
work is done inside EditorSwitchDoorObj */
-class SwitchDoorSwitchObj : public SpriteEditorObj
+class SwitchDoorSwitchObj : public EditorNS::SpriteEditorObj
{
private:
SwitchDoorObj* door;
public:
SwitchDoorSwitchObj (SwitchDoorObj* data);
-
- EditorObj* duplicate ();
+
+ EditorNS::EditorObj* duplicate ();
void write_xml (std::ostream&) {}
std::string status_line ();
@@ -48,6 +49,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: teleporter_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- teleporter_obj.hxx 19 Apr 2003 10:23:18 -0000 1.10
+++ teleporter_obj.hxx 18 Oct 2003 23:17:28 -0000 1.11
@@ -22,19 +22,21 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace EditorNS {
class EditorView;
} // namespace EditorNS
namespace WorldObjsData {
class TeleporterData;
-}
+} // namespace WorldObjsData
namespace EditorObjs {
class TeleporterTargetObj;
-class TeleporterObj : public SpriteEditorObj
+class TeleporterObj : public EditorNS::SpriteEditorObj
{
private:
WorldObjsData::TeleporterData* const data;
@@ -46,13 +48,13 @@
Vector& get_target_pos_ref ();
- EditorObj* duplicate ();
+ EditorNS::EditorObj* duplicate ();
void write_xml (std::ostream& xml);
/** Create this object (and child objects) with reasonable defaults
for the editor */
- static EditorObjLst create (const Vector& pos);
+ static EditorNS::EditorObjLst create (const Vector& pos);
void draw (EditorNS::EditorView * view);
std::string status_line ();
@@ -63,6 +65,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: teleporter_target_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_target_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- teleporter_target_obj.hxx 19 Apr 2003 10:23:18 -0000 1.5
+++ teleporter_target_obj.hxx 18 Oct 2003 23:17:28 -0000 1.6
@@ -22,6 +22,7 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
namespace EditorObjs {
class TeleporterObj;
@@ -51,6 +52,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
Index: thunderstorm_background_obj.cxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/thunderstorm_background_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thunderstorm_background_obj.cxx 28 Sep 2002 11:52:25 -0000 1.3
+++ thunderstorm_background_obj.cxx 18 Oct 2003 23:17:28 -0000 1.4
@@ -20,6 +20,7 @@
#include "../worldobjsdata/thunderstorm_background_data.hxx"
#include "thunderstorm_background_obj.hxx"
+namespace Pingus {
namespace EditorObjs {
ThunderstormBackgroundObj::ThunderstormBackgroundObj (const
WorldObjsData::ThunderstormBackgroundData& data_)
@@ -54,5 +55,6 @@
}
} // namespace EditorObjs
+} // namespace Pingus
/* EOF */
Index: thunderstorm_background_obj.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/editorobjs/thunderstorm_background_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- thunderstorm_background_obj.hxx 19 Apr 2003 10:23:18 -0000 1.5
+++ thunderstorm_background_obj.hxx 18 Oct 2003 23:17:28 -0000 1.6
@@ -22,6 +22,8 @@
#include "../editor/sprite_editorobj.hxx"
+namespace Pingus {
+
namespace WorldObjsData {
class ThunderstormBackgroundData;
}
@@ -49,6 +51,7 @@
};
} // namespace EditorObjs
+} // namespace Pingus
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx, 1.10, 1.11 bumper_obj.hxx, 1.10, 1.11 conveyor_belt_obj.cxx, 1.8, 1.9 conveyor_belt_obj.hxx, 1.8, 1.9 entrance_obj.hxx, 1.4, 1.5 exit_obj.cxx, 1.2, 1.3 exit_obj.hxx, 1.3, 1.4 fake_exit_obj.cxx, 1.11, 1.12 fake_exit_obj.hxx, 1.11, 1.12 groundpiece_obj.cxx, 1.15, 1.16 groundpiece_obj.hxx, 1.5, 1.6 guillotine_obj.cxx, 1.10, 1.11 guillotine_obj.hxx, 1.10, 1.11 hammer_obj.cxx, 1.11, 1.12 hammer_obj.hxx, 1.10, 1.11 hotspot_obj.cxx, 1.3, 1.4 hotspot_obj.hxx, 1.6, 1.7 ice_block_obj.cxx, 1.7, 1.8 ice_block_obj.hxx, 1.6, 1.7 info_box_obj.cxx, 1.5, 1.6 info_box_obj.hxx, 1.7, 1.8 laser_exit_obj.cxx, 1.11, 1.12 laser_exit_obj.hxx, 1.10, 1.11 liquid_obj.cxx, 1.6, 1.7 liquid_obj.hxx, 1.6, 1.7 prefab_obj.cxx, 1.1, 1.2 prefab_obj.hxx, 1.4, 1.5 smasher_obj.cxx, 1.9, 1.10 smasher_obj.hxx, 1.11, 1.12 solid_color_background_obj.cxx, 1.7, 1.8 solid_color_background_obj.hxx, 1.7, 1.8 spike_obj.cxx, 1.11, 1.12 spike_obj.hxx, 1.11, 1.12 starfield_background_obj.cxx, 1.6, 1.7 starfield_background_obj.hxx, 1.7, 1.8 surface_background_obj.cxx, 1.10, 1.11 surface_background_obj.hxx, 1.7, 1.8 switch_door_obj.cxx, 1.8, 1.9 switch_door_obj.hxx, 1.8, 1.9 switch_door_switch_obj.cxx, 1.3, 1.4 switch_door_switch_obj.hxx, 1.5, 1.6 teleporter_obj.hxx, 1.10, 1.11 teleporter_target_obj.hxx, 1.5, 1.6 thunderstorm_background_obj.cxx, 1.3, 1.4 thunderstorm_background_obj.hxx, 1.5, 1.6,
Ingo Ruhnke <=
- Prev by Date:
[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
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/gui buffer_graphic_context.cxx, 1.2, 1.3 buffer_graphic_context.hxx, 1.3, 1.4 button.hxx, 1.5, 1.6 component.hxx, 1.14, 1.15 cursor.cxx, 1.3, 1.4 cursor.hxx, 1.2, 1.3 display.cxx, 1.4, 1.5 display.hxx, 1.4, 1.5 display_graphic_context.cxx, 1.7, 1.8 display_graphic_context.hxx, 1.5, 1.6 game_delta.hxx, 1.2, 1.3 graphic_context.cxx, 1.1, 1.2 graphic_context.hxx, 1.5, 1.6 gui_manager.cxx, 1.21, 1.22 gui_screen.hxx, 1.2, 1.3 root_gui_manager.hxx, 1.6, 1.7 screen_manager.cxx, 1.10, 1.11 screen_manager.hxx, 1.6, 1.7 screen_ptr.cxx, 1.3, 1.4 screen_ptr.hxx, 1.2, 1.3 surface_button.cxx, 1.8, 1.9 surface_button.hxx, 1.8, 1.9
- Previous by thread:
[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
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/gui buffer_graphic_context.cxx, 1.2, 1.3 buffer_graphic_context.hxx, 1.3, 1.4 button.hxx, 1.5, 1.6 component.hxx, 1.14, 1.15 cursor.cxx, 1.3, 1.4 cursor.hxx, 1.2, 1.3 display.cxx, 1.4, 1.5 display.hxx, 1.4, 1.5 display_graphic_context.cxx, 1.7, 1.8 display_graphic_context.hxx, 1.5, 1.6 game_delta.hxx, 1.2, 1.3 graphic_context.cxx, 1.1, 1.2 graphic_context.hxx, 1.5, 1.6 gui_manager.cxx, 1.21, 1.22 gui_screen.hxx, 1.2, 1.3 root_gui_manager.hxx, 1.6, 1.7 screen_manager.cxx, 1.10, 1.11 screen_manager.hxx, 1.6, 1.7 screen_ptr.cxx, 1.3, 1.4 screen_ptr.hxx, 1.2, 1.3 surface_button.cxx, 1.8, 1.9 surface_button.hxx, 1.8, 1.9
- Index(es):