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

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src/worldobjsdata
In directory dark:/tmp/cvs-serv24099/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:
replaced:
EditorObjLst create_EditorObjs()
with
void insertEditorObjs(ObjectManager*)


Index: bumper_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bumper_data.cxx     26 Feb 2003 17:08:29 -0000      1.9
+++ bumper_data.cxx     4 Mar 2003 12:53:47 -0000       1.10
@@ -25,6 +25,7 @@
 #include "../editorobjs/bumper_obj.hxx"
 #include "../worldobjs/bumper.hxx"
 #include "../pingus_resource.hxx"
+#include "../editor/object_manager.hxx"
 
 namespace WorldObjsData {
 
@@ -59,10 +60,10 @@
   world->add_object(new WorldObjs::Bumper(*this));
 }
 
-EditorObjLst
-BumperData::create_EditorObj ()
+void
+BumperData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::BumperObj(*this));
+  obj_mgr->add(new EditorObjs::BumperObj(*this));
 }
 
 } // WorldObjsData

Index: bumper_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bumper_data.hxx     26 Feb 2003 17:08:29 -0000      1.5
+++ bumper_data.hxx     4 Mar 2003 12:53:47 -0000       1.6
@@ -41,7 +41,7 @@
       
   void insert_WorldObjs (World*);
       
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
       
 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- conveyor_belt_data.cxx      26 Feb 2003 17:08:29 -0000      1.9
+++ conveyor_belt_data.cxx      4 Mar 2003 12:53:47 -0000       1.10
@@ -23,6 +23,7 @@
 #include "../xml_file_writer.hxx"
 #include "../editorobjs/conveyor_belt_obj.hxx"
 #include "../worldobjs/conveyor_belt.hxx"
+#include "../editor/object_manager.hxx"
 #include "conveyor_belt_data.hxx"
 
 namespace WorldObjsData {
@@ -70,10 +71,10 @@
   world->add_object(new WorldObjs::ConveyorBelt(*this));
 }
 
-EditorObjLst
-ConveyorBeltData::create_EditorObj ()
+void
+ConveyorBeltData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::ConveyorBeltObj(*this));
+  obj_mgr->add(new EditorObjs::ConveyorBeltObj(*this));
 }
 
 } // namespace WorldObjsData

Index: conveyor_belt_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- conveyor_belt_data.hxx      26 Feb 2003 17:08:29 -0000      1.6
+++ conveyor_belt_data.hxx      4 Mar 2003 12:53:47 -0000       1.7
@@ -47,7 +47,7 @@
   void insert_WorldObjs (World* world);
 
   /** Create an EditorObj from the given data object */
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
   
 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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- entrance_data.cxx   26 Feb 2003 17:08:29 -0000      1.6
+++ entrance_data.cxx   4 Mar 2003 12:53:47 -0000       1.7
@@ -26,6 +26,7 @@
 #include "../string_converter.hxx"
 #include "../xml_helper.hxx"
 #include "../xml_file_reader.hxx"
+#include "../editor/object_manager.hxx"
 #include "entrance_data.hxx"
 
 namespace WorldObjsData {
@@ -117,10 +118,10 @@
   //PingusError::raise("Entrance: Entrance type in Level file is unknown: " + 
type);
 }
 
-EditorObjLst 
-EntranceData::create_EditorObj ()
+void 
+EntranceData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::EntranceObj(*this));
+  obj_mgr->add(new EditorObjs::EntranceObj(*this));
 }
 
 } // namespace WorldObjsData

Index: entrance_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/entrance_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entrance_data.hxx   26 Feb 2003 17:08:29 -0000      1.3
+++ entrance_data.hxx   4 Mar 2003 12:53:47 -0000       1.4
@@ -49,7 +49,7 @@
   
   void write_xml (std::ostream&);
 
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
   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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- exit_data.cxx       26 Feb 2003 17:08:29 -0000      1.6
+++ exit_data.cxx       4 Mar 2003 12:53:47 -0000       1.7
@@ -24,6 +24,7 @@
 #include "../xml_file_reader.hxx"
 #include "../editorobjs/exit_obj.hxx"
 #include "../worldobjs/exit.hxx"
+#include "../editor/object_manager.hxx"
 #include "exit_data.hxx"
 
 namespace WorldObjsData {
@@ -77,10 +78,10 @@
   world->add_object(new WorldObjs::Exit(*this));
 }
 
-EditorObjLst 
-ExitData::create_EditorObj ()
+void
+ExitData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::ExitObj(*this));
+  obj_mgr->add(new EditorObjs::ExitObj(*this));
 }
 
 } // namespace WorldObjsData

Index: exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/exit_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exit_data.hxx       26 Feb 2003 17:08:29 -0000      1.3
+++ exit_data.hxx       4 Mar 2003 12:53:47 -0000       1.4
@@ -50,7 +50,7 @@
   void write_xml (std::ostream&);
   
   void insert_WorldObjs (World*);
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fake_exit_data.cxx  26 Feb 2003 17:08:29 -0000      1.9
+++ fake_exit_data.cxx  4 Mar 2003 12:53:47 -0000       1.10
@@ -24,6 +24,7 @@
 #include "../xml_file_reader.hxx"
 #include "../editorobjs/fake_exit_obj.hxx"
 #include "../worldobjs/fake_exit.hxx"
+#include "../editor/object_manager.hxx"
 #include "../pingus_resource.hxx"
 
 namespace WorldObjsData {
@@ -58,10 +59,10 @@
   world->add_object(new WorldObjs::FakeExit(*this));
 }
 
-EditorObjLst
-FakeExitData::create_EditorObj ()
+void
+FakeExitData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::FakeExitObj(*this));
+  obj_mgr->add(new EditorObjs::FakeExitObj(*this));
 }
 
 } // namespace WorldObjsData

Index: fake_exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/fake_exit_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fake_exit_data.hxx  26 Feb 2003 17:08:29 -0000      1.5
+++ fake_exit_data.hxx  4 Mar 2003 12:53:47 -0000       1.6
@@ -43,7 +43,7 @@
       
   void insert_WorldObjs (World*);
       
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
       
 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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- groundpiece_data.cxx        26 Feb 2003 17:08:29 -0000      1.14
+++ groundpiece_data.cxx        4 Mar 2003 12:53:47 -0000       1.15
@@ -25,6 +25,7 @@
 #include "../xml_helper.hxx"
 #include "../file_reader.hxx"
 #include "../file_writer.hxx"
+#include "../editor/object_manager.hxx"
 #include "groundpiece_data.hxx"
 
 namespace WorldObjsData {
@@ -83,10 +84,10 @@
 GroundpieceData::~GroundpieceData ()
 {
 }
-EditorObjLst
-GroundpieceData::create_EditorObj ()
+void
+GroundpieceData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::GroundpieceObj(*this));
+  obj_mgr->add(new EditorObjs::GroundpieceObj(*this));
 }
 
 void

Index: groundpiece_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- groundpiece_data.hxx        26 Feb 2003 17:08:29 -0000      1.5
+++ groundpiece_data.hxx        4 Mar 2003 12:53:47 -0000       1.6
@@ -50,7 +50,7 @@
   ~GroundpieceData ();
 
   void insert_WorldObjs (World*);
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
   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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- guillotine_data.cxx 26 Feb 2003 17:08:29 -0000      1.9
+++ guillotine_data.cxx 4 Mar 2003 12:53:47 -0000       1.10
@@ -25,7 +25,7 @@
 #include "../editorobjs/guillotine_obj.hxx"
 #include "../worldobjs/guillotine.hxx"
 #include "../pingus_resource.hxx"
-
+#include "../editor/object_manager.hxx"
 namespace WorldObjsData {
 
 GuillotineData::GuillotineData ()
@@ -64,10 +64,10 @@
   world->add_object(new WorldObjs::Guillotine(*this));
 }
 
-EditorObjLst
-GuillotineData::create_EditorObj ()
+void
+GuillotineData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::GuillotineObj(*this));
+  obj_mgr->add(new EditorObjs::GuillotineObj(*this));
 }
 
 } // namespace WorldObjsData

Index: guillotine_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/guillotine_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- guillotine_data.hxx 26 Feb 2003 17:08:29 -0000      1.5
+++ guillotine_data.hxx 4 Mar 2003 12:53:47 -0000       1.6
@@ -47,7 +47,7 @@
       
   void insert_WorldObjs (World*);
       
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
       
 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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hammer_data.cxx     26 Feb 2003 17:08:29 -0000      1.10
+++ hammer_data.cxx     4 Mar 2003 12:53:47 -0000       1.11
@@ -23,6 +23,7 @@
 #include "../xml_file_reader.hxx"
 #include "../editorobjs/hammer_obj.hxx"
 #include "../worldobjs/hammer.hxx"
+#include "../editor/object_manager.hxx"
 #include "../pingus_resource.hxx"
 
 namespace WorldObjsData {
@@ -57,10 +58,10 @@
   world->add_object(new WorldObjs::Hammer(*this));
 }
 
-EditorObjLst
-HammerData::create_EditorObj ()
+void
+HammerData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::HammerObj(*this));
+  obj_mgr->add(new EditorObjs::HammerObj(*this));
 }
 
 } // namespace WorldObjsData

Index: hammer_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hammer_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hammer_data.hxx     26 Feb 2003 17:08:29 -0000      1.6
+++ hammer_data.hxx     4 Mar 2003 12:53:47 -0000       1.7
@@ -42,7 +42,7 @@
       
   void insert_WorldObjs (World* world);
       
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
       
 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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hotspot_data.cxx    26 Feb 2003 17:08:29 -0000      1.5
+++ hotspot_data.cxx    4 Mar 2003 12:53:47 -0000       1.6
@@ -23,6 +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 "hotspot_data.hxx"
 
 namespace WorldObjsData {
@@ -65,10 +67,10 @@
   world->add_object(new WorldObjs::Hotspot(*this));
 }
 
-EditorObjLst 
-HotspotData::create_EditorObj ()
+void
+HotspotData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::HotspotObj(*this));
+  obj_mgr->add(new EditorObjs::HotspotObj(*this));
 }
 
 } //namespace WorldObjsData

Index: hotspot_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hotspot_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hotspot_data.hxx    26 Feb 2003 17:08:29 -0000      1.5
+++ hotspot_data.hxx    4 Mar 2003 12:53:47 -0000       1.6
@@ -44,7 +44,7 @@
   void write_xml (std::ostream&);
 
   void  insert_WorldObjs (World*);
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
   
 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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ice_block_data.cxx  26 Feb 2003 17:08:29 -0000      1.8
+++ ice_block_data.cxx  4 Mar 2003 12:53:47 -0000       1.9
@@ -23,6 +23,7 @@
 #include "../xml_helper.hxx"
 #include "../editorobjs/ice_block_obj.hxx"
 #include "../worldobjs/ice_block.hxx"
+#include "../editor/object_manager.hxx"
 #include "ice_block_data.hxx"
 
 namespace WorldObjsData {
@@ -61,10 +62,10 @@
   world->add_object(new WorldObjs::IceBlock(*this));
 }
 
-EditorObjLst
-IceBlockData::create_EditorObj ()
+void
+IceBlockData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::IceBlockObj(*this));
+  obj_mgr->add(new EditorObjs::IceBlockObj(*this));
 }
 
 } // namespace WorldObjsData

Index: ice_block_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ice_block_data.hxx  26 Feb 2003 17:08:29 -0000      1.5
+++ ice_block_data.hxx  4 Mar 2003 12:53:47 -0000       1.6
@@ -47,7 +47,7 @@
   void insert_WorldObjs (World* world);
 
   /** Create an EditorObj from the given data object */
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
   
 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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- info_box_data.cxx   26 Feb 2003 17:08:29 -0000      1.10
+++ info_box_data.cxx   4 Mar 2003 12:53:47 -0000       1.11
@@ -23,6 +23,7 @@
 #include "../xml_helper.hxx"
 #include "../editorobjs/info_box_obj.hxx"
 #include "../worldobjs/info_box.hxx"
+#include "../editor/object_manager.hxx"
 #include "info_box_data.hxx"
 
 namespace WorldObjsData {
@@ -41,10 +42,10 @@
   world->add_object(new WorldObjs::InfoBox(*this));
 }
 
-EditorObjLst
-InfoBoxData::create_EditorObj ()
+void
+InfoBoxData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::InfoBoxObj(*this));
+  obj_mgr->add(new EditorObjs::InfoBoxObj(*this));
 }
 
 InfoBoxData::InfoBoxData (xmlDocPtr doc, xmlNodePtr cur)

Index: info_box_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/info_box_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- info_box_data.hxx   26 Feb 2003 17:08:29 -0000      1.5
+++ info_box_data.hxx   4 Mar 2003 12:53:47 -0000       1.6
@@ -48,7 +48,7 @@
   void write_xml (std::ostream& xml);  
   
   void insert_WorldObjs (World* world);
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
   
 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- laser_exit_data.cxx 26 Feb 2003 17:08:29 -0000      1.9
+++ laser_exit_data.cxx 4 Mar 2003 12:53:47 -0000       1.10
@@ -24,6 +24,7 @@
 #include "../xml_file_reader.hxx"
 #include "../editorobjs/laser_exit_obj.hxx"
 #include "../worldobjs/laser_exit.hxx"
+#include "../editor/object_manager.hxx"
 #include "../pingus_resource.hxx"
 
 namespace WorldObjsData {
@@ -58,10 +59,10 @@
   world->add_object(new WorldObjs::LaserExit(*this));
 }
 
-EditorObjLst
-LaserExitData::create_EditorObj ()
+void
+LaserExitData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::LaserExitObj(*this));
+  obj_mgr->add(new EditorObjs::LaserExitObj(*this));
 }
 
 } // namespace WorldObjsData

Index: laser_exit_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/laser_exit_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- laser_exit_data.hxx 26 Feb 2003 17:08:29 -0000      1.5
+++ laser_exit_data.hxx 4 Mar 2003 12:53:47 -0000       1.6
@@ -43,7 +43,7 @@
       
   void insert_WorldObjs (World*);
       
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
       
 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- liquid_data.cxx     26 Feb 2003 17:08:29 -0000      1.9
+++ liquid_data.cxx     4 Mar 2003 12:53:47 -0000       1.10
@@ -24,6 +24,7 @@
 #include "../string_converter.hxx"
 #include "../xml_helper.hxx"
 #include "../xml_file_reader.hxx"
+#include "../editor/object_manager.hxx"
 #include "liquid_data.hxx"
 
 namespace WorldObjsData {
@@ -81,10 +82,10 @@
   world->add_object(new WorldObjs::Liquid(*this));
 }
 
-EditorObjLst
-LiquidData::create_EditorObj () 
+void
+LiquidData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 { 
-  return EditorObjLst(1, new EditorObjs::LiquidObj(*this));
+  obj_mgr->add(new EditorObjs::LiquidObj(*this));
 }
 
 } // namespace WorldObjsData

Index: liquid_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/liquid_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- liquid_data.hxx     26 Feb 2003 17:08:29 -0000      1.5
+++ liquid_data.hxx     4 Mar 2003 12:53:47 -0000       1.6
@@ -53,7 +53,7 @@
   void insert_WorldObjs (World* world);
 
   /** Create an EditorObj from the given data object */
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
 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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- prefab_obj_data.cxx 26 Feb 2003 17:08:29 -0000      1.7
+++ prefab_obj_data.cxx 4 Mar 2003 12:53:47 -0000       1.8
@@ -43,12 +43,13 @@
 void
 PrefabObjData::insert_WorldObjs ()
 {
+  // FIXME:
 }
 
-EditorObjLst
-PrefabObjData::create_EditorObj ()
+void
+PrefabObjData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst (); //data->create_EditorObj ();
+  // FIXME:
 }
 
 } // namespace WorldObjsData

Index: prefab_obj_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- prefab_obj_data.hxx 26 Feb 2003 17:08:29 -0000      1.5
+++ prefab_obj_data.hxx 4 Mar 2003 12:53:47 -0000       1.6
@@ -59,7 +59,7 @@
   void insert_WorldObjs ();
   
   /** Create a EditorObjs::PrefabObj from the prefab data */
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
 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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rain_generator_data.cxx     26 Feb 2003 17:08:29 -0000      1.4
+++ rain_generator_data.cxx     4 Mar 2003 12:53:47 -0000       1.5
@@ -21,6 +21,7 @@
 #include "../world.hxx"
 #include "../editor/weather_obj.hxx"
 #include "../worldobjs/rain_generator.hxx"
+#include "../editor/object_manager.hxx"
 #include "rain_generator_data.hxx"
 
 namespace WorldObjsData {
@@ -37,10 +38,10 @@
   world->add_object(new WorldObjs::RainGenerator());
 }
 
-EditorObjLst
-RainGeneratorData::create_EditorObj ()
+void
+RainGeneratorData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new WeatherObj("rain-generator"));
+  obj_mgr->add(new WeatherObj("rain-generator"));
 }
 
 } // namespace WorldObjsData

Index: rain_generator_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/rain_generator_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rain_generator_data.hxx     26 Feb 2003 17:08:29 -0000      1.4
+++ rain_generator_data.hxx     4 Mar 2003 12:53:47 -0000       1.5
@@ -33,7 +33,7 @@
   RainGeneratorData(xmlDocPtr doc, xmlNodePtr cur) { UNUSED_ARG(doc); 
UNUSED_ARG(cur); }
 
   void insert_WorldObjs (World* world);
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
   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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- smasher_data.cxx    26 Feb 2003 17:08:29 -0000      1.9
+++ smasher_data.cxx    4 Mar 2003 12:53:47 -0000       1.10
@@ -24,6 +24,7 @@
 #include "../xml_file_reader.hxx"
 #include "../editorobjs/smasher_obj.hxx"
 #include "../worldobjs/smasher.hxx"
+#include "../editor/object_manager.hxx"
 #include "../pingus_resource.hxx"
 
 namespace WorldObjsData {
@@ -58,10 +59,10 @@
   world->add_object(new WorldObjs::Smasher(*this));
 }
 
-EditorObjLst
-SmasherData::create_EditorObj ()
+void
+SmasherData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::SmasherObj(*this));
+  obj_mgr->add(new EditorObjs::SmasherObj(*this));
 }
 
 } // namespace WorldObjsData

Index: smasher_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/smasher_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- smasher_data.hxx    26 Feb 2003 17:08:29 -0000      1.5
+++ smasher_data.hxx    4 Mar 2003 12:53:47 -0000       1.6
@@ -41,7 +41,7 @@
       
   void insert_WorldObjs (World*);
       
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
       
 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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- snow_generator_data.cxx     26 Feb 2003 17:08:29 -0000      1.6
+++ snow_generator_data.cxx     4 Mar 2003 12:53:47 -0000       1.7
@@ -22,6 +22,7 @@
 #include "../xml_file_reader.hxx"
 #include "../editor/weather_obj.hxx"
 #include "../worldobjs/snow_generator.hxx"
+#include "../editor/object_manager.hxx"
 #include "snow_generator_data.hxx"
 
 namespace WorldObjsData {
@@ -49,10 +50,10 @@
   world->add_object(new WorldObjs::SnowGenerator(*this));
 }
 
-EditorObjLst
-SnowGeneratorData::create_EditorObj ()
+void
+SnowGeneratorData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new WeatherObj("snow-generator"));
+  obj_mgr->add(new WeatherObj("snow-generator"));
 }
 
 } // namespace WorldObjsData

Index: snow_generator_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/snow_generator_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- snow_generator_data.hxx     26 Feb 2003 17:08:29 -0000      1.7
+++ snow_generator_data.hxx     4 Mar 2003 12:53:47 -0000       1.8
@@ -34,7 +34,7 @@
   SnowGeneratorData(xmlDocPtr doc, xmlNodePtr cur);
   
   void insert_WorldObjs (World* world);
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
   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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- solid_color_background_data.cxx     26 Feb 2003 17:08:29 -0000      1.5
+++ solid_color_background_data.cxx     4 Mar 2003 12:53:47 -0000       1.6
@@ -23,6 +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 "solid_color_background_data.hxx"
 
 namespace WorldObjsData {
@@ -55,10 +56,10 @@
   world->add_object(new WorldObjs::SolidColorBackground(*this));
 }
 
-EditorObjLst 
-SolidColorBackgroundData::create_EditorObj()
+void
+SolidColorBackgroundData::insert_EditorObjs(EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::SolidColorBackgroundObj(*this));
+  obj_mgr->add(new EditorObjs::SolidColorBackgroundObj(*this));
 }
 
 } // namespace WorldObjsData

Index: solid_color_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/solid_color_background_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- solid_color_background_data.hxx     26 Feb 2003 17:08:29 -0000      1.4
+++ solid_color_background_data.hxx     4 Mar 2003 12:53:47 -0000       1.5
@@ -46,7 +46,7 @@
   virtual void write_xml (std::ostream& xml);
 
   void insert_WorldObjs (World* world);
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- spike_data.cxx      26 Feb 2003 17:08:30 -0000      1.9
+++ spike_data.cxx      4 Mar 2003 12:53:47 -0000       1.10
@@ -25,6 +25,7 @@
 #include "../editorobjs/spike_obj.hxx"
 #include "../worldobjs/spike.hxx"
 #include "../pingus_resource.hxx"
+#include "../editor/object_manager.hxx"
 
 namespace WorldObjsData {
 
@@ -59,10 +60,10 @@
   world->add_object(new WorldObjs::Spike(*this));
 }
 
-EditorObjLst
-SpikeData::create_EditorObj ()
+void
+SpikeData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::SpikeObj(*this));
+  obj_mgr->add(new EditorObjs::SpikeObj(*this));
 }
 
 } // namespace WorldObjsData

Index: spike_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/spike_data.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- spike_data.hxx      26 Feb 2003 17:08:30 -0000      1.6
+++ spike_data.hxx      4 Mar 2003 12:53:47 -0000       1.7
@@ -44,7 +44,7 @@
       
   void insert_WorldObjs (World*);
       
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
       
 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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- starfield_background_data.cxx       26 Feb 2003 17:08:30 -0000      1.7
+++ starfield_background_data.cxx       4 Mar 2003 12:53:47 -0000       1.8
@@ -22,6 +22,7 @@
 #include "../xml_file_reader.hxx"
 #include "../editorobjs/starfield_background_obj.hxx"
 #include "../worldobjs/starfield_background.hxx"
+#include "../editor/object_manager.hxx"
 #include "starfield_background_data.hxx"
 
 namespace WorldObjsData {
@@ -71,10 +72,10 @@
   world->add_object(new WorldObjs::StarfieldBackground(*this));
 }
 
-EditorObjLst
-StarfieldBackgroundData::create_EditorObj ()
+void
+StarfieldBackgroundData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::StarfieldBackgroundObj(*this));
+  obj_mgr->add(new EditorObjs::StarfieldBackgroundObj(*this));
 }
 
 } // namespace WorldObjsData

Index: starfield_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/starfield_background_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- starfield_background_data.hxx       26 Feb 2003 17:08:30 -0000      1.3
+++ starfield_background_data.hxx       4 Mar 2003 12:53:47 -0000       1.4
@@ -38,8 +38,8 @@
 
   void write_xml (std::ostream& xml);
 
-  void    insert_WorldObjs (World*);
-  EditorObjLst create_EditorObj ();
+  void insert_WorldObjs (World*);
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- surface_background_data.cxx 26 Feb 2003 17:08:30 -0000      1.9
+++ surface_background_data.cxx 4 Mar 2003 12:53:47 -0000       1.10
@@ -23,6 +23,7 @@
 #include "../xml_file_reader.hxx"
 #include "../editorobjs/surface_background_obj.hxx"
 #include "../worldobjs/surface_background.hxx"
+#include "../editor/object_manager.hxx"
 #include "surface_background_data.hxx"
 
 namespace WorldObjsData {
@@ -108,10 +109,10 @@
   world->add_object(new WorldObjs::SurfaceBackground(*this));
 }
 
-EditorObjLst 
-SurfaceBackgroundData::create_EditorObj ()
+void
+SurfaceBackgroundData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::SurfaceBackgroundObj(*this));
+  obj_mgr->add(new EditorObjs::SurfaceBackgroundObj(*this));
 }
 
 } // namespace WorldObjsData

Index: surface_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/surface_background_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- surface_background_data.hxx 26 Feb 2003 17:08:30 -0000      1.5
+++ surface_background_data.hxx 4 Mar 2003 12:53:47 -0000       1.6
@@ -76,7 +76,7 @@
   void write_xml (std::ostream& xml);
   
   void insert_WorldObjs (World* world);
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- switch_door_data.cxx        26 Feb 2003 17:08:30 -0000      1.9
+++ switch_door_data.cxx        4 Mar 2003 12:53:47 -0000       1.10
@@ -23,6 +23,7 @@
 #include "../xml_helper.hxx"
 #include "../editorobjs/switch_door_obj.hxx"
 #include "../worldobjs/switch_door.hxx"
+#include "../editor/object_manager.hxx"
 #include "switch_door_data.hxx"
 
 namespace WorldObjsData {
@@ -75,14 +76,12 @@
 }
 
 /** Create an EditorObj from the given data object */
-EditorObjLst
-SwitchDoorData::create_EditorObj ()
+void
+SwitchDoorData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  EditorObjLst lst(2); 
   EditorObjs::SwitchDoorObj* obj = new EditorObjs::SwitchDoorObj(*this);
-  lst[0] = obj;
-  lst[1] = new EditorObjs::SwitchDoorSwitchObj(obj);
-  return lst;
+  obj_mgr->add(obj);
+  obj_mgr->add(new EditorObjs::SwitchDoorSwitchObj(obj));
 }
 
 } // namespace WorldObjsData

Index: switch_door_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- switch_door_data.hxx        26 Feb 2003 17:08:30 -0000      1.5
+++ switch_door_data.hxx        4 Mar 2003 12:53:47 -0000       1.6
@@ -52,7 +52,7 @@
   void insert_WorldObjs (World* world);
 
   /** Create an EditorObj from the given data object */
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
 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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- teleporter_data.cxx 26 Feb 2003 17:08:30 -0000      1.10
+++ teleporter_data.cxx 4 Mar 2003 12:53:47 -0000       1.11
@@ -25,7 +25,7 @@
 #include "../editorobjs/teleporter_obj.hxx"
 #include "../editorobjs/teleporter_target_obj.hxx"
 #include "../worldobjs/teleporter.hxx"
-
+#include "../editor/object_manager.hxx"
 namespace WorldObjsData {
 
 TeleporterData::TeleporterData ()
@@ -66,18 +66,13 @@
   world->add_object(new WorldObjs::Teleporter(*this));
 }
 
-EditorObjLst
-TeleporterData::create_EditorObj ()
+void
+TeleporterData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  EditorObjLst objs(2);
-  
-  EditorObjs::TeleporterObj*       teleporter        = new 
EditorObjs::TeleporterObj(*this);
-  EditorObjs::TeleporterTargetObj* teleporter_target = new 
EditorObjs::TeleporterTargetObj(teleporter);
-
-  objs[0] = teleporter;
-  objs[1] = teleporter_target;
+  EditorObjs::TeleporterObj* teleporter = new EditorObjs::TeleporterObj(*this);
 
-  return objs;
+  obj_mgr->add(teleporter);
+  obj_mgr->add(new EditorObjs::TeleporterTargetObj(teleporter));
 }
 
 } // namespace WorldObjsData

Index: teleporter_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/teleporter_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- teleporter_data.hxx 26 Feb 2003 17:08:30 -0000      1.5
+++ teleporter_data.hxx 4 Mar 2003 12:53:47 -0000       1.6
@@ -45,7 +45,7 @@
   void insert_WorldObjs (World*);
 
   /** Create an EditorObj from the given data object */
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
   
 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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- thunderstorm_background_data.cxx    26 Feb 2003 17:08:30 -0000      1.5
+++ thunderstorm_background_data.cxx    4 Mar 2003 12:53:47 -0000       1.6
@@ -23,6 +23,7 @@
 #include "../xml_file_reader.hxx"
 #include "../editorobjs/thunderstorm_background_obj.hxx"
 #include "../worldobjs/thunderstorm_background.hxx"
+#include "../editor/object_manager.hxx"
 #include "thunderstorm_background_data.hxx"
 
 namespace WorldObjsData {
@@ -52,10 +53,10 @@
   world->add_object(new WorldObjs::ThunderstormBackground(*this));
 }
 
-EditorObjLst 
-ThunderstormBackgroundData::create_EditorObj ()
+void
+ThunderstormBackgroundData::insert_EditorObjs (EditorNS::ObjectManager* 
obj_mgr)
 {
-  return EditorObjLst(1, new EditorObjs::ThunderstormBackgroundObj(*this));
+  obj_mgr->add(new EditorObjs::ThunderstormBackgroundObj(*this));
 }
 
 } // namespace WorldObjsData

Index: thunderstorm_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thunderstorm_background_data.hxx    26 Feb 2003 17:08:30 -0000      1.4
+++ thunderstorm_background_data.hxx    4 Mar 2003 12:53:47 -0000       1.5
@@ -42,7 +42,7 @@
   virtual void write_xml (std::ostream& xml);
 
   void insert_WorldObjs (World* world);
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
 
 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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- worldobj_group_data.cxx     26 Feb 2003 17:08:30 -0000      1.7
+++ worldobj_group_data.cxx     4 Mar 2003 12:53:47 -0000       1.8
@@ -23,6 +23,7 @@
 #include "../xml_helper.hxx"
 #include "../worldobj_data_factory.hxx"
 #include "../worldobjs/worldobj_group.hxx"
+#include "../editor/object_manager.hxx"
 #include "worldobj_group_data.hxx"
 
 namespace WorldObjsData {
@@ -86,25 +87,17 @@
   world->add_object(new WorldObjs::WorldObjGroup (*this));
 }
 
-EditorObjLst 
-WorldObjGroupData::create_EditorObj ()
+void
+WorldObjGroupData::insert_EditorObjs (EditorNS::ObjectManager* obj_mgr)
 {
-  EditorObjLst lst(1);
-  EditorObjGroup* group = new EditorObjGroup();
-  lst[0] = group;
+  //EditorObjGroup* group = new EditorObjGroup();
 
   for (ObjsIter i = objs.begin (); i != objs.end (); ++i)
     {
-      EditorObjLst sublst ((*i)->create_EditorObj ());
-      for (EditorObjLst::iterator j = sublst.begin (); j != sublst.end (); ++j)
-       {
-         group->add (*j);
-       }
+      (*i)->insert_EditorObjs (obj_mgr);
     }
-
-  return lst;
 }
-
+ 
 } // namespace WorldObjsData
 
 /* EOF */

Index: worldobj_group_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- worldobj_group_data.hxx     26 Feb 2003 17:08:30 -0000      1.5
+++ worldobj_group_data.hxx     4 Mar 2003 12:53:47 -0000       1.6
@@ -47,7 +47,7 @@
   void insert_WorldObjs (World*);
 
   /** Create an EditorObj from the given data object */
-  EditorObjLst create_EditorObj ();
+  void insert_EditorObjs (EditorNS::ObjectManager*);
   
 private:
   WorldObjGroupData& operator= (const WorldObjGroupData&);