[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ConveyorBelt.cc,1.37,1.38 ConveyorBelt.hh,1.22,1.23 IceBlock.cc,1.30,1.31 IceBlock.hh,1.23,1.24 InfoBox.cc,1.9,1.10 InfoBox.hh,1.7,1.8 SwitchDoor.cc,1.32,1.33 SwitchDoor.hh,1.23,1.24 Teleporter.cc,1.39,1.40 Teleporter.hh,1.30,1.31

[torangan]

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

Modified Files:
        ConveyorBelt.cc ConveyorBelt.hh IceBlock.cc IceBlock.hh 
        InfoBox.cc InfoBox.hh SwitchDoor.cc SwitchDoor.hh 
        Teleporter.cc Teleporter.hh 
Log Message:
replaced shared_ptr<WorldObj> with WorldObj*


Index: ConveyorBelt.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ConveyorBelt.cc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ConveyorBelt.cc     10 Jun 2002 15:01:24 -0000      1.37
+++ ConveyorBelt.cc     11 Jun 2002 18:28:37 -0000      1.38
@@ -74,10 +74,10 @@
     }
 }
 
-boost::shared_ptr<WorldObj> 
+WorldObj* 
 ConveyorBeltData::create_WorldObj ()
 {
-  return boost::shared_ptr<WorldObj> (new ConveyorBelt (this));
+  return new ConveyorBelt (this);
 }
 
 std::list<boost::shared_ptr<EditorObj> > 

Index: ConveyorBelt.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ConveyorBelt.hh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ConveyorBelt.hh     10 Jun 2002 11:00:29 -0000      1.22
+++ ConveyorBelt.hh     11 Jun 2002 18:28:37 -0000      1.23
@@ -40,7 +40,7 @@
   ///
 
   /** Create an WorldObj from the given data object */
-  boost::shared_ptr<WorldObj> create_WorldObj ();
+  WorldObj* create_WorldObj ();
 
   /** Create an EditorObj from the given data object */
   std::list<boost::shared_ptr<EditorObj> > create_EditorObj ();

Index: IceBlock.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/IceBlock.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- IceBlock.cc 10 Jun 2002 13:03:36 -0000      1.30
+++ IceBlock.cc 11 Jun 2002 18:28:37 -0000      1.31
@@ -68,10 +68,10 @@
     }
 }
 
-boost::shared_ptr<WorldObj> 
+WorldObj* 
 IceBlockData::create_WorldObj ()
 {
-  return boost::shared_ptr<WorldObj> (new IceBlock (*this));
+  return new IceBlock (*this);
 }
 
 std::list<boost::shared_ptr<EditorObj> > 

Index: IceBlock.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/IceBlock.hh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- IceBlock.hh 10 Jun 2002 11:00:29 -0000      1.23
+++ IceBlock.hh 11 Jun 2002 18:28:37 -0000      1.24
@@ -48,7 +48,7 @@
   void write_xml(std::ofstream* xml);
   
   /** Create an WorldObj from the given data object */
-  boost::shared_ptr<WorldObj> create_WorldObj ();
+  WorldObj* create_WorldObj ();
 
   /** Create an EditorObj from the given data object */
   std::list<boost::shared_ptr<EditorObj> > create_EditorObj ();

Index: InfoBox.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/InfoBox.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- InfoBox.cc  10 Jun 2002 13:03:36 -0000      1.9
+++ InfoBox.cc  11 Jun 2002 18:28:37 -0000      1.10
@@ -35,10 +35,10 @@
 {
 }
 
-boost::shared_ptr<WorldObj> 
+WorldObj* 
 InfoBoxData::create_WorldObj()
 {
-  return boost::shared_ptr<WorldObj> (new InfoBox (*this));
+  return new InfoBox (*this);
 }
 
 EditorObjLst

Index: InfoBox.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/InfoBox.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- InfoBox.hh  10 Jun 2002 11:00:29 -0000      1.7
+++ InfoBox.hh  11 Jun 2002 18:28:37 -0000      1.8
@@ -41,7 +41,7 @@
   CL_Vector text_pos;
 
   void write_xml(std::ofstream* xml);  
-  boost::shared_ptr<WorldObj> create_WorldObj();
+  WorldObj* create_WorldObj();
   EditorObjLst create_EditorObj();
 };
 

Index: SwitchDoor.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/SwitchDoor.cc,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- SwitchDoor.cc       10 Jun 2002 13:03:36 -0000      1.32
+++ SwitchDoor.cc       11 Jun 2002 18:28:37 -0000      1.33
@@ -108,10 +108,10 @@
 }
 
 /** Create an WorldObj from the given data object */
-boost::shared_ptr<WorldObj> 
+WorldObj* 
 SwitchDoorData::create_WorldObj ()
 {
-  return boost::shared_ptr<WorldObj> (new SwitchDoor (*this));
+  return new SwitchDoor (*this);
 }
 
 /** Create an EditorObj from the given data object */

Index: SwitchDoor.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/SwitchDoor.hh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- SwitchDoor.hh       9 Jun 2002 13:03:11 -0000       1.23
+++ SwitchDoor.hh       11 Jun 2002 18:28:37 -0000      1.24
@@ -51,7 +51,7 @@
   void write_xml(std::ofstream* xml);
   
   /** Create an WorldObj from the given data object */
-  boost::shared_ptr<WorldObj> create_WorldObj ();
+  WorldObj* create_WorldObj ();
 
   /** Create an EditorObj from the given data object */
   std::list<boost::shared_ptr<EditorObj> > create_EditorObj ();

Index: Teleporter.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/Teleporter.cc,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Teleporter.cc       10 Jun 2002 13:03:36 -0000      1.39
+++ Teleporter.cc       11 Jun 2002 18:28:37 -0000      1.40
@@ -79,11 +79,10 @@
     }
 }
 
-boost::shared_ptr<WorldObj> 
+WorldObj* 
 TeleporterData::create_WorldObj ()
 {
-  //std::cout << "TeleportData::create_WorldObj () not implemented" << 
std::endl;
-  return boost::shared_ptr<WorldObj> (new Teleporter (*this));
+  return new Teleporter (*this);
 }
 
 std::list<boost::shared_ptr<EditorObj> > 

Index: Teleporter.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/Teleporter.hh,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Teleporter.hh       10 Jun 2002 13:03:36 -0000      1.30
+++ Teleporter.hh       11 Jun 2002 18:28:37 -0000      1.31
@@ -48,7 +48,7 @@
   void write_xml(std::ofstream* xml);
   
   /** Create an WorldObj from the given data object */
-  boost::shared_ptr<WorldObj> create_WorldObj ();
+  WorldObj* create_WorldObj ();
 
   /** Create an EditorObj from the given data object */
   std::list<boost::shared_ptr<EditorObj> > create_EditorObj ();