[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.10,1.
|
From: |
grumbel |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.10,1.11 bumper_data.hxx,1.6,1.7 conveyor_belt_data.cxx,1.10,1.11 conveyor_belt_data.hxx,1.7,1.8 entrance_data.cxx,1.7,1.8 entrance_data.hxx,1.4,1.5 exit_data.cxx,1.8,1.9 exit_data.hxx,1.4,1.5 fake_exit_data.cxx,1.10,1.11 fake_exit_data.hxx,1.6,1.7 groundpiece_data.cxx,1.15,1.16 groundpiece_data.hxx,1.6,1.7 guillotine_data.cxx,1.10,1.11 guillotine_data.hxx,1.6,1.7 hammer_data.cxx,1.11,1.12 hammer_data.hxx,1.7,1.8 hotspot_data.cxx,1.6,1.7 hotspot_data.hxx,1.6,1.7 ice_block_data.cxx,1.9,1.10 ice_block_data.hxx,1.6,1.7 info_box_data.cxx,1.11,1.12 info_box_data.hxx,1.6,1.7 laser_exit_data.cxx,1.10,1.11 laser_exit_data.hxx,1.6,1.7 liquid_data.cxx,1.11,1.12 liquid_data.hxx,1.6,1.7 prefab_obj_data.cxx,1.9,1.10 prefab_obj_data.hxx,1.6,1.7 rain_generator_data.cxx,1.5,1.6 rain_generator_data.hxx,1.5,1.6 smasher_data.cxx,1.10,1.11 smasher_data.hxx,1.6,1.7 snow_generator_data.cxx,1.7,1.8 snow_generator_data.hxx,1.8,1.9solid_color_background_data.cxx,1.6,1.7 solid_color_background_data.hxx,1.5,1.6 spike_data.cxx,1.10,1.11 spike_data.hxx,1.7,1.8 starfield_background_data.cxx,1.8,1.9 starfield_background_data.hxx,1.4,1.5surface_background_data.cxx,1.10,1.11 surface_background_data.hxx,1.6,1.7 switch_door_data.cxx,1.10,1.11 switch_door_data.hxx,1.6,1.7 teleporter_data.cxx,1.11,1.12 teleporter_data.hxx,1.6,1.7thunderstorm_background_data.cxx,1.6,1.7 thunderstorm_background_data.hxx,1.5,1.6 worldobj_group_data.cxx,1.8,1.9 worldobj_group_data.hxx,1.6,1.7 |
|
Date: |
5 Mar 2003 19:14:02 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjsdata
In directory dark:/tmp/cvs-serv15506/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:
- fixed object group loading in the editor
Index: bumper_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- bumper_data.cxx 4 Mar 2003 12:53:47 -0000 1.10
+++ bumper_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
@@ -25,7 +25,7 @@
#include "../editorobjs/bumper_obj.hxx"
#include "../worldobjs/bumper.hxx"
#include "../pingus_resource.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
namespace WorldObjsData {
@@ -61,7 +61,7 @@
}
void
-BumperData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+BumperData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::BumperObj(*this));
}
Index: bumper_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bumper_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ bumper_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -41,7 +41,7 @@
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
BumperData& operator= (const BumperData&);
Index: conveyor_belt_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- conveyor_belt_data.cxx 4 Mar 2003 12:53:47 -0000 1.10
+++ conveyor_belt_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
@@ -23,7 +23,7 @@
#include "../xml_file_writer.hxx"
#include "../editorobjs/conveyor_belt_obj.hxx"
#include "../worldobjs/conveyor_belt.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "conveyor_belt_data.hxx"
namespace WorldObjsData {
@@ -72,7 +72,7 @@
}
void
-ConveyorBeltData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+ConveyorBeltData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::ConveyorBeltObj(*this));
}
Index: conveyor_belt_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- conveyor_belt_data.hxx 4 Mar 2003 12:53:47 -0000 1.7
+++ conveyor_belt_data.hxx 5 Mar 2003 19:13:59 -0000 1.8
@@ -47,7 +47,7 @@
void insert_WorldObjs (World* world);
/** Create an EditorObj from the given data object */
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
ConveyorBeltData& operator= (const ConveyorBeltData&);
Index: entrance_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/entrance_data.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- entrance_data.cxx 4 Mar 2003 12:53:47 -0000 1.7
+++ entrance_data.cxx 5 Mar 2003 19:13:59 -0000 1.8
@@ -26,7 +26,7 @@
#include "../string_converter.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "entrance_data.hxx"
namespace WorldObjsData {
@@ -119,7 +119,7 @@
}
void
-EntranceData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+EntranceData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::EntranceObj(*this));
}
Index: entrance_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/entrance_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- entrance_data.hxx 4 Mar 2003 12:53:47 -0000 1.4
+++ entrance_data.hxx 5 Mar 2003 19:13:59 -0000 1.5
@@ -49,7 +49,7 @@
void write_xml (std::ostream&);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
void insert_WorldObjs (World*);
private:
Index: exit_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/exit_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exit_data.cxx 4 Mar 2003 17:02:51 -0000 1.8
+++ exit_data.cxx 5 Mar 2003 19:13:59 -0000 1.9
@@ -24,7 +24,7 @@
#include "../xml_file_reader.hxx"
#include "../editorobjs/exit_obj.hxx"
#include "../worldobjs/exit.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "exit_data.hxx"
namespace WorldObjsData {
@@ -80,7 +80,7 @@
}
void
-ExitData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+ExitData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::ExitObj(*this));
}
Index: exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/exit_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exit_data.hxx 4 Mar 2003 12:53:47 -0000 1.4
+++ exit_data.hxx 5 Mar 2003 19:13:59 -0000 1.5
@@ -50,7 +50,7 @@
void write_xml (std::ostream&);
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
ExitData& operator= (const ExitData& old);
Index: fake_exit_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/fake_exit_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fake_exit_data.cxx 4 Mar 2003 12:53:47 -0000 1.10
+++ fake_exit_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
@@ -24,7 +24,7 @@
#include "../xml_file_reader.hxx"
#include "../editorobjs/fake_exit_obj.hxx"
#include "../worldobjs/fake_exit.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "../pingus_resource.hxx"
namespace WorldObjsData {
@@ -60,7 +60,7 @@
}
void
-FakeExitData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+FakeExitData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::FakeExitObj(*this));
}
Index: fake_exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/fake_exit_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fake_exit_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ fake_exit_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -43,7 +43,7 @@
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
FakeExitData& operator= (const FakeExitData&);
Index: groundpiece_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- groundpiece_data.cxx 4 Mar 2003 12:53:47 -0000 1.15
+++ groundpiece_data.cxx 5 Mar 2003 19:13:59 -0000 1.16
@@ -25,7 +25,7 @@
#include "../xml_helper.hxx"
#include "../file_reader.hxx"
#include "../file_writer.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "groundpiece_data.hxx"
namespace WorldObjsData {
@@ -85,7 +85,7 @@
{
}
void
-GroundpieceData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+GroundpieceData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::GroundpieceObj(*this));
}
Index: groundpiece_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- groundpiece_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ groundpiece_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -50,7 +50,7 @@
~GroundpieceData ();
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
void write_xml (std::ostream& xml);
Index: guillotine_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/guillotine_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- guillotine_data.cxx 4 Mar 2003 12:53:47 -0000 1.10
+++ guillotine_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
@@ -25,7 +25,8 @@
#include "../editorobjs/guillotine_obj.hxx"
#include "../worldobjs/guillotine.hxx"
#include "../pingus_resource.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
+
namespace WorldObjsData {
GuillotineData::GuillotineData ()
@@ -65,7 +66,7 @@
}
void
-GuillotineData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+GuillotineData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::GuillotineObj(*this));
}
Index: guillotine_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/guillotine_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- guillotine_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ guillotine_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -47,7 +47,7 @@
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
GuillotineData& operator= (const GuillotineData&);
Index: hammer_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hammer_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hammer_data.cxx 4 Mar 2003 12:53:47 -0000 1.11
+++ hammer_data.cxx 5 Mar 2003 19:13:59 -0000 1.12
@@ -23,7 +23,7 @@
#include "../xml_file_reader.hxx"
#include "../editorobjs/hammer_obj.hxx"
#include "../worldobjs/hammer.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "../pingus_resource.hxx"
namespace WorldObjsData {
@@ -59,7 +59,7 @@
}
void
-HammerData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+HammerData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::HammerObj(*this));
}
Index: hammer_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hammer_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hammer_data.hxx 4 Mar 2003 12:53:47 -0000 1.7
+++ hammer_data.hxx 5 Mar 2003 19:13:59 -0000 1.8
@@ -42,7 +42,7 @@
void insert_WorldObjs (World* world);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
HammerData& operator= (const HammerData&);
Index: hotspot_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hotspot_data.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hotspot_data.cxx 4 Mar 2003 12:53:47 -0000 1.6
+++ hotspot_data.cxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -23,8 +23,8 @@
#include "../worldobjs/hotspot.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
-#include "../editor/object_manager.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "hotspot_data.hxx"
namespace WorldObjsData {
@@ -68,7 +68,7 @@
}
void
-HotspotData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+HotspotData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::HotspotObj(*this));
}
Index: hotspot_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hotspot_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hotspot_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ hotspot_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -44,7 +44,7 @@
void write_xml (std::ostream&);
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
HotspotData& operator= (const HotspotData&);
Index: ice_block_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ice_block_data.cxx 4 Mar 2003 12:53:47 -0000 1.9
+++ ice_block_data.cxx 5 Mar 2003 19:13:59 -0000 1.10
@@ -23,7 +23,7 @@
#include "../xml_helper.hxx"
#include "../editorobjs/ice_block_obj.hxx"
#include "../worldobjs/ice_block.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "ice_block_data.hxx"
namespace WorldObjsData {
@@ -63,7 +63,7 @@
}
void
-IceBlockData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+IceBlockData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::IceBlockObj(*this));
}
Index: ice_block_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ice_block_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ ice_block_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -47,7 +47,7 @@
void insert_WorldObjs (World* world);
/** Create an EditorObj from the given data object */
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
IceBlockData& operator= (const IceBlockData&);
Index: info_box_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/info_box_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- info_box_data.cxx 4 Mar 2003 12:53:47 -0000 1.11
+++ info_box_data.cxx 5 Mar 2003 19:13:59 -0000 1.12
@@ -23,7 +23,7 @@
#include "../xml_helper.hxx"
#include "../editorobjs/info_box_obj.hxx"
#include "../worldobjs/info_box.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "info_box_data.hxx"
namespace WorldObjsData {
@@ -43,7 +43,7 @@
}
void
-InfoBoxData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+InfoBoxData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::InfoBoxObj(*this));
}
Index: info_box_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/info_box_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- info_box_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ info_box_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -48,7 +48,7 @@
void write_xml (std::ostream& xml);
void insert_WorldObjs (World* world);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
InfoBoxData& operator= (const InfoBoxData&);
Index: laser_exit_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/laser_exit_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- laser_exit_data.cxx 4 Mar 2003 12:53:47 -0000 1.10
+++ laser_exit_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
@@ -24,7 +24,7 @@
#include "../xml_file_reader.hxx"
#include "../editorobjs/laser_exit_obj.hxx"
#include "../worldobjs/laser_exit.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "../pingus_resource.hxx"
namespace WorldObjsData {
@@ -60,7 +60,7 @@
}
void
-LaserExitData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+LaserExitData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::LaserExitObj(*this));
}
Index: laser_exit_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/laser_exit_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- laser_exit_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ laser_exit_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -43,7 +43,7 @@
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
LaserExitData& operator= (const LaserExitData&);
Index: liquid_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/liquid_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- liquid_data.cxx 4 Mar 2003 17:02:51 -0000 1.11
+++ liquid_data.cxx 5 Mar 2003 19:13:59 -0000 1.12
@@ -24,7 +24,7 @@
#include "../string_converter.hxx"
#include "../xml_helper.hxx"
#include "../xml_file_reader.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "liquid_data.hxx"
namespace WorldObjsData {
@@ -84,7 +84,7 @@
}
void
-LiquidData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+LiquidData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::LiquidObj(*this));
}
Index: liquid_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/liquid_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- liquid_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ liquid_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -53,7 +53,7 @@
void insert_WorldObjs (World* world);
/** Create an EditorObj from the given data object */
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
LiquidData& operator= (const LiquidData&);
Index: prefab_obj_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- prefab_obj_data.cxx 4 Mar 2003 20:18:33 -0000 1.9
+++ prefab_obj_data.cxx 5 Mar 2003 19:13:59 -0000 1.10
@@ -27,17 +27,12 @@
PrefabObjData::PrefabObjData (xmlDocPtr doc, xmlNodePtr cur)
{
- if (!XMLhelper::get_prop(cur, "type", uid))
- {
- std::cout << "PrefabObjData: missing type! Default to test" << std::endl;
- uid = "test";
- }
-
XMLFileReader reader(doc, cur);
reader.read_vector("position", pos);
+ reader.read_string("type", type);
// try to load the data for this prefab-uid
- data = Prefab::create (uid);
+ data = Prefab::create (type);
}
void
@@ -47,7 +42,7 @@
}
void
-PrefabObjData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+PrefabObjData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
UNUSED_ARG(obj_mgr);
// FIXME:
Index: prefab_obj_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- prefab_obj_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ prefab_obj_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -46,7 +46,7 @@
Vector pos;
/** The uniq identifer of this prefab */
- std::string uid;
+ std::string type;
/** A pointer to the prefab (just for caching, this is not real data
of this object, since it can be consturcted from the name) */
@@ -59,7 +59,7 @@
void insert_WorldObjs ();
/** Create a EditorObjs::PrefabObj from the prefab data */
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
PrefabObjData (const PrefabObjData&);
Index: rain_generator_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/rain_generator_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rain_generator_data.cxx 4 Mar 2003 12:53:47 -0000 1.5
+++ rain_generator_data.cxx 5 Mar 2003 19:13:59 -0000 1.6
@@ -21,7 +21,7 @@
#include "../world.hxx"
#include "../editor/weather_obj.hxx"
#include "../worldobjs/rain_generator.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "rain_generator_data.hxx"
namespace WorldObjsData {
@@ -39,7 +39,7 @@
}
void
-RainGeneratorData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+RainGeneratorData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new WeatherObj("rain-generator"));
}
Index: rain_generator_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/rain_generator_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rain_generator_data.hxx 4 Mar 2003 12:53:47 -0000 1.5
+++ rain_generator_data.hxx 5 Mar 2003 19:13:59 -0000 1.6
@@ -33,7 +33,7 @@
RainGeneratorData(xmlDocPtr doc, xmlNodePtr cur) { UNUSED_ARG(doc);
UNUSED_ARG(cur); }
void insert_WorldObjs (World* world);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
void write_xml(std::ostream& xml);
private:
Index: smasher_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/smasher_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smasher_data.cxx 4 Mar 2003 12:53:47 -0000 1.10
+++ smasher_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
@@ -24,7 +24,7 @@
#include "../xml_file_reader.hxx"
#include "../editorobjs/smasher_obj.hxx"
#include "../worldobjs/smasher.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "../pingus_resource.hxx"
namespace WorldObjsData {
@@ -60,7 +60,7 @@
}
void
-SmasherData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+SmasherData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::SmasherObj(*this));
}
Index: smasher_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/smasher_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- smasher_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ smasher_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -41,7 +41,7 @@
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
SmasherData& operator= (const SmasherData&);
Index: snow_generator_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/snow_generator_data.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- snow_generator_data.cxx 4 Mar 2003 12:53:47 -0000 1.7
+++ snow_generator_data.cxx 5 Mar 2003 19:13:59 -0000 1.8
@@ -22,7 +22,7 @@
#include "../xml_file_reader.hxx"
#include "../editor/weather_obj.hxx"
#include "../worldobjs/snow_generator.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "snow_generator_data.hxx"
namespace WorldObjsData {
@@ -51,7 +51,7 @@
}
void
-SnowGeneratorData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+SnowGeneratorData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new WeatherObj("snow-generator"));
}
Index: snow_generator_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/snow_generator_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- snow_generator_data.hxx 4 Mar 2003 12:53:47 -0000 1.8
+++ snow_generator_data.hxx 5 Mar 2003 19:13:59 -0000 1.9
@@ -34,7 +34,7 @@
SnowGeneratorData(xmlDocPtr doc, xmlNodePtr cur);
void insert_WorldObjs (World* world);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
void write_xml(std::ostream& xml);
private:
Index: solid_color_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/solid_color_background_data.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- solid_color_background_data.cxx 4 Mar 2003 12:53:47 -0000 1.6
+++ solid_color_background_data.cxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -23,7 +23,7 @@
#include "../xml_file_writer.hxx"
#include "../editorobjs/solid_color_background_obj.hxx"
#include "../worldobjs/solid_color_background.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "solid_color_background_data.hxx"
namespace WorldObjsData {
@@ -57,7 +57,7 @@
}
void
-SolidColorBackgroundData::insert_EditorObjs(EditorNS::ObjectManager* obj_mgr)
+SolidColorBackgroundData::insert_EditorObjs(EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::SolidColorBackgroundObj(*this));
}
Index: solid_color_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/solid_color_background_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- solid_color_background_data.hxx 4 Mar 2003 12:53:47 -0000 1.5
+++ solid_color_background_data.hxx 5 Mar 2003 19:13:59 -0000 1.6
@@ -46,7 +46,7 @@
virtual void write_xml (std::ostream& xml);
void insert_WorldObjs (World* world);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
SolidColorBackgroundData& operator= (const SolidColorBackgroundData&);
Index: spike_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/spike_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- spike_data.cxx 4 Mar 2003 12:53:47 -0000 1.10
+++ spike_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
@@ -25,7 +25,7 @@
#include "../editorobjs/spike_obj.hxx"
#include "../worldobjs/spike.hxx"
#include "../pingus_resource.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
namespace WorldObjsData {
@@ -61,7 +61,7 @@
}
void
-SpikeData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+SpikeData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::SpikeObj(*this));
}
Index: spike_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/spike_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- spike_data.hxx 4 Mar 2003 12:53:47 -0000 1.7
+++ spike_data.hxx 5 Mar 2003 19:13:59 -0000 1.8
@@ -44,7 +44,7 @@
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
SpikeData& operator= (const SpikeData&);
Index: starfield_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/starfield_background_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- starfield_background_data.cxx 4 Mar 2003 12:53:47 -0000 1.8
+++ starfield_background_data.cxx 5 Mar 2003 19:13:59 -0000 1.9
@@ -22,7 +22,7 @@
#include "../xml_file_reader.hxx"
#include "../editorobjs/starfield_background_obj.hxx"
#include "../worldobjs/starfield_background.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "starfield_background_data.hxx"
namespace WorldObjsData {
@@ -73,7 +73,7 @@
}
void
-StarfieldBackgroundData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+StarfieldBackgroundData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::StarfieldBackgroundObj(*this));
}
Index: starfield_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/starfield_background_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- starfield_background_data.hxx 4 Mar 2003 12:53:47 -0000 1.4
+++ starfield_background_data.hxx 5 Mar 2003 19:13:59 -0000 1.5
@@ -39,7 +39,7 @@
void write_xml (std::ostream& xml);
void insert_WorldObjs (World*);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
StarfieldBackgroundData& operator= (const StarfieldBackgroundData&);
Index: surface_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/surface_background_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- surface_background_data.cxx 4 Mar 2003 12:53:47 -0000 1.10
+++ surface_background_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
@@ -23,7 +23,7 @@
#include "../xml_file_reader.hxx"
#include "../editorobjs/surface_background_obj.hxx"
#include "../worldobjs/surface_background.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "surface_background_data.hxx"
namespace WorldObjsData {
@@ -110,7 +110,7 @@
}
void
-SurfaceBackgroundData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+SurfaceBackgroundData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::SurfaceBackgroundObj(*this));
}
Index: surface_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/surface_background_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- surface_background_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ surface_background_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -76,7 +76,7 @@
void write_xml (std::ostream& xml);
void insert_WorldObjs (World* world);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
SurfaceBackgroundData& operator= (const SurfaceBackgroundData&);
Index: switch_door_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- switch_door_data.cxx 4 Mar 2003 12:53:47 -0000 1.10
+++ switch_door_data.cxx 5 Mar 2003 19:13:59 -0000 1.11
@@ -23,7 +23,7 @@
#include "../xml_helper.hxx"
#include "../editorobjs/switch_door_obj.hxx"
#include "../worldobjs/switch_door.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "switch_door_data.hxx"
namespace WorldObjsData {
@@ -77,7 +77,7 @@
/** Create an EditorObj from the given data object */
void
-SwitchDoorData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+SwitchDoorData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
EditorObjs::SwitchDoorObj* obj = new EditorObjs::SwitchDoorObj(*this);
obj_mgr->add(obj);
Index: switch_door_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- switch_door_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ switch_door_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -52,7 +52,7 @@
void insert_WorldObjs (World* world);
/** Create an EditorObj from the given data object */
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
SwitchDoorData& operator= (const SwitchDoorData&);
Index: teleporter_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/teleporter_data.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- teleporter_data.cxx 4 Mar 2003 12:53:47 -0000 1.11
+++ teleporter_data.cxx 5 Mar 2003 19:13:59 -0000 1.12
@@ -25,7 +25,7 @@
#include "../editorobjs/teleporter_obj.hxx"
#include "../editorobjs/teleporter_target_obj.hxx"
#include "../worldobjs/teleporter.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
namespace WorldObjsData {
TeleporterData::TeleporterData ()
@@ -67,7 +67,7 @@
}
void
-TeleporterData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+TeleporterData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
EditorObjs::TeleporterObj* teleporter = new EditorObjs::TeleporterObj(*this);
Index: teleporter_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/teleporter_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- teleporter_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ teleporter_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -45,7 +45,7 @@
void insert_WorldObjs (World*);
/** Create an EditorObj from the given data object */
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
TeleporterData& operator= (const TeleporterData& data);
Index: thunderstorm_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- thunderstorm_background_data.cxx 4 Mar 2003 12:53:47 -0000 1.6
+++ thunderstorm_background_data.cxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -23,7 +23,7 @@
#include "../xml_file_reader.hxx"
#include "../editorobjs/thunderstorm_background_obj.hxx"
#include "../worldobjs/thunderstorm_background.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "thunderstorm_background_data.hxx"
namespace WorldObjsData {
@@ -54,7 +54,7 @@
}
void
-ThunderstormBackgroundData::insert_EditorObjs (EditorNS::ObjectManager*
obj_mgr)
+ThunderstormBackgroundData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
obj_mgr->add(new EditorObjs::ThunderstormBackgroundObj(*this));
}
Index: thunderstorm_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- thunderstorm_background_data.hxx 4 Mar 2003 12:53:47 -0000 1.5
+++ thunderstorm_background_data.hxx 5 Mar 2003 19:13:59 -0000 1.6
@@ -42,7 +42,7 @@
virtual void write_xml (std::ostream& xml);
void insert_WorldObjs (World* world);
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
ThunderstormBackgroundData& operator= (const ThunderstormBackgroundData&);
Index: worldobj_group_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- worldobj_group_data.cxx 4 Mar 2003 12:53:47 -0000 1.8
+++ worldobj_group_data.cxx 5 Mar 2003 19:13:59 -0000 1.9
@@ -23,7 +23,7 @@
#include "../xml_helper.hxx"
#include "../worldobj_data_factory.hxx"
#include "../worldobjs/worldobj_group.hxx"
-#include "../editor/object_manager.hxx"
+#include "../editor/editorobj_mgr.hxx"
#include "worldobj_group_data.hxx"
namespace WorldObjsData {
@@ -84,18 +84,23 @@
void
WorldObjGroupData::insert_WorldObjs (World* world)
{
- world->add_object(new WorldObjs::WorldObjGroup (*this));
+ // Flatten all objects of the group and insert them normal into the
+ // world
+ for (ObjsIter i = objs.begin (); i != objs.end (); ++i)
+ (*i)->insert_WorldObjs(world);
}
void
-WorldObjGroupData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
+WorldObjGroupData::insert_EditorObjs (EditorNS::EditorObjMgr* obj_mgr)
{
- //EditorObjGroup* group = new EditorObjGroup();
+ EditorObjGroup* group = new EditorObjGroup();
for (ObjsIter i = objs.begin (); i != objs.end (); ++i)
{
- (*i)->insert_EditorObjs (obj_mgr);
+ (*i)->insert_EditorObjs(group);
}
+
+ obj_mgr->add(group);
}
} // namespace WorldObjsData
Index: worldobj_group_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- worldobj_group_data.hxx 4 Mar 2003 12:53:47 -0000 1.6
+++ worldobj_group_data.hxx 5 Mar 2003 19:13:59 -0000 1.7
@@ -47,7 +47,7 @@
void insert_WorldObjs (World*);
/** Create an EditorObj from the given data object */
- void insert_EditorObjs (EditorNS::ObjectManager*);
+ void insert_EditorObjs (EditorNS::EditorObjMgr*);
private:
WorldObjGroupData& operator= (const WorldObjGroupData&);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.10,1.11 bumper_data.hxx,1.6,1.7 conveyor_belt_data.cxx,1.10,1.11 conveyor_belt_data.hxx,1.7,1.8 entrance_data.cxx,1.7,1.8 entrance_data.hxx,1.4,1.5 exit_data.cxx,1.8,1.9 exit_data.hxx,1.4,1.5 fake_exit_data.cxx,1.10,1.11 fake_exit_data.hxx,1.6,1.7 groundpiece_data.cxx,1.15,1.16 groundpiece_data.hxx,1.6,1.7 guillotine_data.cxx,1.10,1.11 guillotine_data.hxx,1.6,1.7 hammer_data.cxx,1.11,1.12 hammer_data.hxx,1.7,1.8 hotspot_data.cxx,1.6,1.7 hotspot_data.hxx,1.6,1.7 ice_block_data.cxx,1.9,1.10 ice_block_data.hxx,1.6,1.7 info_box_data.cxx,1.11,1.12 info_box_data.hxx,1.6,1.7 laser_exit_data.cxx,1.10,1.11 laser_exit_data.hxx,1.6,1.7 liquid_data.cxx,1.11,1.12 liquid_data.hxx,1.6,1.7 prefab_obj_data.cxx,1.9,1.10 prefab_obj_data.hxx,1.6,1.7 rain_generator_data.cxx,1.5,1.6 rain_generator_data.hxx,1.5,1.6 smasher_data.cxx,1.10,1.11 smasher_data.hxx,1.6,1.7 snow_generator_data.cxx,1.7,1.8 snow_generator_data.hxx,1.8,1.9solid_color_background_data.cxx,1.6,1.7 solid_color_background_data.hxx,1.5,1.6 spike_data.cxx,1.10,1.11 spike_data.hxx,1.7,1.8 starfield_background_data.cxx,1.8,1.9 starfield_background_data.hxx,1.4,1.5surface_background_data.cxx,1.10,1.11 surface_background_data.hxx,1.6,1.7 switch_door_data.cxx,1.10,1.11 switch_door_data.hxx,1.6,1.7 teleporter_data.cxx,1.11,1.12 teleporter_data.hxx,1.6,1.7thunderstorm_background_data.cxx,1.6,1.7 thunderstorm_background_data.hxx,1.5,1.6 worldobj_group_data.cxx,1.8,1.9 worldobj_group_data.hxx,1.6,1.7,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editorobj_group_data.cxx,1.3,NONE editorobj_group_data.hxx,1.6,NONE
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs prefab_obj.hxx,1.2,1.3
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editorobj_group_data.cxx,1.3,NONE editorobj_group_data.hxx,1.6,NONE
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs prefab_obj.hxx,1.2,1.3
- Index(es):