[Pingus-CVS] CVS: Games/Pingus/src/worldobjs conveyor_belt.cxx,1.4,1.5 conveyor_belt.hxx,1.4,1.5 ice_block.cxx,1.6,1.7 ice_block.hxx,1.4,1.5 info_box.cxx,1.3,1.4 info_box.hxx,1.5,1.6 switch_door.cxx,1.4,1.5 switch_door.hxx,1.5,1.6 teleporter.cxx,1.3,1.4 teleporter.hxx,1.5,1.6

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv9717/worldobjs

Modified Files:
        conveyor_belt.cxx conveyor_belt.hxx ice_block.cxx 
        ice_block.hxx info_box.cxx info_box.hxx switch_door.cxx 
        switch_door.hxx teleporter.cxx teleporter.hxx 
Log Message:
replaced std::list<shared_ptr> with std::vector<EditorObj*>

Index: conveyor_belt.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- conveyor_belt.cxx   1 Jul 2002 18:36:40 -0000       1.4
+++ conveyor_belt.cxx   2 Jul 2002 10:42:39 -0000       1.5
@@ -79,11 +79,11 @@
   return new ConveyorBelt (this);
 }
 
-std::list<boost::shared_ptr<EditorObj> > 
+EditorObjLst
 ConveyorBeltData::create_EditorObj ()
 {
   EditorObjLst lst; 
-  lst.push_back(boost::shared_ptr<EditorObj> (new EditorConveyorBeltObj 
(*this)));
+  lst.push_back(new EditorConveyorBeltObj (*this));
   return lst;
 }
 
@@ -195,13 +195,11 @@
   // not supported
 }
 
-std::list<boost::shared_ptr<EditorObj> > 
+EditorObjLst
 EditorConveyorBeltObj::create (const CL_Vector& pos)
 {
   ConveyorBeltData data;
-
   data.pos = pos;
-
   return data.create_EditorObj ();
 }
   

Index: conveyor_belt.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- conveyor_belt.hxx   1 Jul 2002 18:36:40 -0000       1.4
+++ conveyor_belt.hxx   2 Jul 2002 10:42:39 -0000       1.5
@@ -43,7 +43,7 @@
   WorldObj* create_WorldObj ();
 
   /** Create an EditorObj from the given data object */
-  std::list<boost::shared_ptr<EditorObj> > create_EditorObj ();
+  EditorObjLst create_EditorObj ();
 };
 
 class ConveyorBelt : private ConveyorBeltData,
@@ -88,10 +88,10 @@
   void set_position_offset(const CL_Vector &);
   
   /// The saving will be done in EditorTeleporterObj::save_xml
-  static std::list<boost::shared_ptr<EditorObj> > create (WorldObjData* obj);
+  static EditorObjLst create (WorldObjData* obj);
 
   /** Create the object with reasonable defaults */
-  static std::list<boost::shared_ptr<EditorObj> > create (const CL_Vector& 
pos);
+  static EditorObjLst create (const CL_Vector& pos);
 
   CL_Vector get_upper_left_corner() { return pos; }
 

Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ice_block.cxx       1 Jul 2002 18:36:40 -0000       1.6
+++ ice_block.cxx       2 Jul 2002 10:42:39 -0000       1.7
@@ -75,11 +75,11 @@
   return new IceBlock (*this);
 }
 
-std::list<boost::shared_ptr<EditorObj> > 
+EditorObjLst
 IceBlockData::create_EditorObj ()
 {
   EditorObjLst lst; 
-  lst.push_back(boost::shared_ptr<EditorObj> (new EditorIceBlockObj (*this)));
+  lst.push_back(new EditorIceBlockObj (*this));
   return lst;
 }
 
@@ -156,7 +156,7 @@
 }
 
 /** Create the object with resonable defaults */
-std::list<boost::shared_ptr<EditorObj> > 
+EditorObjLst
 EditorIceBlockObj::create (const CL_Vector& pos)
 {
   IceBlockData data;

Index: ice_block.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ice_block.hxx       1 Jul 2002 18:36:40 -0000       1.4
+++ ice_block.hxx       2 Jul 2002 10:42:39 -0000       1.5
@@ -51,7 +51,7 @@
   WorldObj* create_WorldObj ();
 
   /** Create an EditorObj from the given data object */
-  std::list<boost::shared_ptr<EditorObj> > create_EditorObj ();
+  EditorObjLst create_EditorObj ();
 };
 
 class IceBlock : public IceBlockData, 
@@ -80,7 +80,7 @@
   EditorIceBlockObj (const IceBlockData& data);
 
   /** Create the object with resonable defaults */
-  static std::list<boost::shared_ptr<EditorObj> > create (const CL_Vector& 
pos);
+  static EditorObjLst create (const CL_Vector& pos);
 
   void write_xml(std::ostream& xml) { IceBlockData::write_xml (xml); }
   EditorObj* duplicate();

Index: info_box.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- info_box.cxx        1 Jul 2002 18:36:40 -0000       1.3
+++ info_box.cxx        2 Jul 2002 10:42:39 -0000       1.4
@@ -46,7 +46,7 @@
 InfoBoxData::create_EditorObj()
 {
   EditorObjLst lst;
-  lst.push_back (boost::shared_ptr<EditorObj>(new EditorInfoBox (*this)));
+  lst.push_back (new EditorInfoBox (*this));
   return lst;
 }
 
@@ -140,13 +140,13 @@
   sprite.set_align_center_bottom ();
 }
 
-std::list<boost::shared_ptr<EditorObj> >
+EditorObjLst
 EditorInfoBox::create (const CL_Vector& pos)
 {
-  std::list<boost::shared_ptr<EditorObj> > lst;
+  EditorObjLst lst;
   InfoBoxData data;
   data.pos = pos;
-  lst.push_back (boost::shared_ptr<EditorObj>(new EditorInfoBox (data)));
+  lst.push_back (new EditorInfoBox (data));
   return lst;
 }
 

Index: info_box.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- info_box.hxx        1 Jul 2002 18:36:40 -0000       1.5
+++ info_box.hxx        2 Jul 2002 10:42:39 -0000       1.6
@@ -67,7 +67,7 @@
 public:
   EditorInfoBox (const InfoBoxData& data);
 
-  static std::list<boost::shared_ptr<EditorObj> > create (const CL_Vector& 
pos);
+  static EditorObjLst create (const CL_Vector& pos);
 
   void write_xml(std::ostream& xml) { InfoBoxData::write_xml (xml); }
   EditorObj* duplicate();

Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- switch_door.cxx     1 Jul 2002 18:36:40 -0000       1.4
+++ switch_door.cxx     2 Jul 2002 10:42:39 -0000       1.5
@@ -116,13 +116,13 @@
 }
 
 /** Create an EditorObj from the given data object */
-std::list<boost::shared_ptr<EditorObj> >
+EditorObjLst
 SwitchDoorData::create_EditorObj ()
 {
   EditorObjLst lst; 
   EditorSwitchDoorObj* obj = new EditorSwitchDoorObj (*this);
-  lst.push_back(boost::shared_ptr<EditorObj> (obj));
-  lst.push_back(boost::shared_ptr<EditorObj> (new EditorSwitchDoorSwitchObj 
(obj)));
+  lst.push_back(obj);
+  lst.push_back(new EditorSwitchDoorSwitchObj (obj));
   return lst;
 }
 
@@ -248,7 +248,7 @@
 
 /** Create this object (and child objects) with resonable defaults
     for the editor */
-std::list<boost::shared_ptr<EditorObj> >
+EditorObjLst
 EditorSwitchDoorObj::create (const CL_Vector& pos)
 {
   SwitchDoorData data;

Index: switch_door.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- switch_door.hxx     1 Jul 2002 18:36:40 -0000       1.5
+++ switch_door.hxx     2 Jul 2002 10:42:39 -0000       1.6
@@ -53,7 +53,7 @@
   WorldObj* create_WorldObj ();
 
   /** Create an EditorObj from the given data object */
-  std::list<boost::shared_ptr<EditorObj> > create_EditorObj ();
+  EditorObjLst create_EditorObj ();
 };
 
 /** A door and a switch, if a pingu is passing the switch, the door
@@ -116,7 +116,7 @@
   
   /** Create this object (and child objects) with reasonable defaults
       for the editor */
-  static std::list<boost::shared_ptr<EditorObj> > create (const CL_Vector& 
pos);
+  static EditorObjLst create (const CL_Vector& pos);
 
   EditorObj* duplicate();
   float get_z_pos() { return door_pos.z; }

Index: teleporter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/teleporter.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- teleporter.cxx      1 Jul 2002 18:36:40 -0000       1.3
+++ teleporter.cxx      2 Jul 2002 10:42:39 -0000       1.4
@@ -85,17 +85,17 @@
   return new Teleporter (*this);
 }
 
-std::list<boost::shared_ptr<EditorObj> > 
+EditorObjLst
 TeleporterData::create_EditorObj ()
 {
   std::cout << "TeleportData::create_EditorObj () " << std::endl;
-  std::list<boost::shared_ptr<EditorObj> > objs;
+  EditorObjLst objs;
   
   EditorTeleporterObj*       teleporter = new EditorTeleporterObj (*this);
   EditorTeleporterTargetObj* teleporter_target = new EditorTeleporterTargetObj 
(teleporter);
 
-  objs.push_back (boost::shared_ptr<EditorObj> (teleporter));
-  objs.push_back (boost::shared_ptr<EditorObj> (teleporter_target));
+  objs.push_back ( (teleporter));
+  objs.push_back ( (teleporter_target));
 
   std::cout << "TeleportData::create_EditorObj (): done" << std::endl;
 
@@ -170,21 +170,21 @@
   return 0;
 }
 
-std::list<boost::shared_ptr<EditorObj> > 
+EditorObjLst
 EditorTeleporterObj::create (const TeleporterData& data)
 {
-  std::list<boost::shared_ptr<EditorObj> > objs;
+   EditorObjLst objs;
 
   EditorTeleporterObj* teleporter=new EditorTeleporterObj (data);
   EditorTeleporterTargetObj* teleporter_target=new EditorTeleporterTargetObj 
(teleporter);
 
-  objs.push_back (boost::shared_ptr<EditorObj>(teleporter));
-  objs.push_back (boost::shared_ptr<EditorObj>(teleporter_target));
+  objs.push_back (teleporter);
+  objs.push_back (teleporter_target);
 
   return objs;
 }
 
-std::list<boost::shared_ptr<EditorObj> >
+EditorObjLst
 EditorTeleporterObj::create (const CL_Vector& pos)
 {
   TeleporterData data;

Index: teleporter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/teleporter.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- teleporter.hxx      1 Jul 2002 18:36:40 -0000       1.5
+++ teleporter.hxx      2 Jul 2002 10:42:39 -0000       1.6
@@ -51,7 +51,7 @@
   WorldObj* create_WorldObj ();
 
   /** Create an EditorObj from the given data object */
-  std::list<boost::shared_ptr<EditorObj> > create_EditorObj ();
+  EditorObjLst create_EditorObj ();
 };
 
 class Teleporter : private TeleporterData,
@@ -84,13 +84,13 @@
   CL_Vector& get_target_pos_ref () { return target_pos; }
 
   EditorObj* duplicate();
-  static std::list<boost::shared_ptr<EditorObj> > create (const 
TeleporterData& data);
+  static EditorObjLst create (const TeleporterData& data);
   
   void write_xml(std::ostream& xml) { TeleporterData::write_xml(xml); }
 
   /** Create this object (and child objects) with reasonable defaults
       for the editor */
-  static std::list<boost::shared_ptr<EditorObj> > create (const CL_Vector& 
pos);
+  static EditorObjLst create (const CL_Vector& pos);
 
   void draw (EditorView * view);
   void save_xml (std::ostream& xml);