[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs conveyor_belt.cxx,1.3,1.4 c
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs conveyor_belt.cxx,1.3,1.4 conveyor_belt.hxx,1.3,1.4 ice_block.cxx,1.5,1.6 ice_block.hxx,1.3,1.4 info_box.cxx,1.2,1.3 info_box.hxx,1.4,1.5 switch_door.cxx,1.3,1.4 switch_door.hxx,1.4,1.5 teleporter.cxx,1.2,1.3 teleporter.hxx,1.4,1.5 |
Date: |
1 Jul 2002 18:36:42 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv24111/src/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:
- removed a few shared_ptr's
- fixed a level
- some std::list and std::vector replacements
Index: conveyor_belt.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- conveyor_belt.cxx 25 Jun 2002 12:20:34 -0000 1.3
+++ conveyor_belt.cxx 1 Jul 2002 18:36:40 -0000 1.4
@@ -164,11 +164,10 @@
counter = 0.0f;
}
-boost::shared_ptr<EditorObj>
+EditorObj*
EditorConveyorBeltObj::duplicate()
{
- return boost::shared_ptr<EditorObj>(new EditorConveyorBeltObj
- (static_cast<ConveyorBeltData> (*this)));
+ return new EditorConveyorBeltObj (static_cast<ConveyorBeltData> (*this));
}
void
Index: conveyor_belt.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- conveyor_belt.hxx 25 Jun 2002 12:20:34 -0000 1.3
+++ conveyor_belt.hxx 1 Jul 2002 18:36:40 -0000 1.4
@@ -76,7 +76,7 @@
public:
EditorConveyorBeltObj (const ConveyorBeltData&);
- boost::shared_ptr<EditorObj> duplicate();
+ EditorObj* duplicate();
void draw (EditorView * view);
void draw_scroll_map(int x_pos, int y_pos, int arg_width, int arg_height);
Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ice_block.cxx 28 Jun 2002 09:51:46 -0000 1.5
+++ ice_block.cxx 1 Jul 2002 18:36:40 -0000 1.6
@@ -174,11 +174,11 @@
return str;
}
-boost::shared_ptr<EditorObj>
+EditorObj*
EditorIceBlockObj::duplicate()
{
std::cout << "EditorIceBlockObj::duplicate(): Not implemented" << std::endl;
- return boost::shared_ptr<EditorObj> ();
+ return 0;
}
/* EOF */
Index: ice_block.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ice_block.hxx 25 Jun 2002 12:20:34 -0000 1.3
+++ ice_block.hxx 1 Jul 2002 18:36:40 -0000 1.4
@@ -83,7 +83,7 @@
static std::list<boost::shared_ptr<EditorObj> > create (const CL_Vector&
pos);
void write_xml(std::ostream& xml) { IceBlockData::write_xml (xml); }
- boost::shared_ptr<EditorObj> duplicate();
+ EditorObj* duplicate();
std::string status_line();
};
Index: info_box.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- info_box.cxx 25 Jun 2002 12:20:34 -0000 1.2
+++ info_box.cxx 1 Jul 2002 18:36:40 -0000 1.3
@@ -150,10 +150,10 @@
return lst;
}
-boost::shared_ptr<EditorObj>
+EditorObj*
EditorInfoBox::duplicate()
{
- return boost::shared_ptr<EditorObj>(new EditorInfoBox (*this));
+ return new EditorInfoBox (*this);
}
std::string
Index: info_box.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- info_box.hxx 25 Jun 2002 12:20:34 -0000 1.4
+++ info_box.hxx 1 Jul 2002 18:36:40 -0000 1.5
@@ -70,7 +70,7 @@
static std::list<boost::shared_ptr<EditorObj> > create (const CL_Vector&
pos);
void write_xml(std::ostream& xml) { InfoBoxData::write_xml (xml); }
- boost::shared_ptr<EditorObj> duplicate();
+ EditorObj* duplicate();
std::string status_line ();
};
Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- switch_door.cxx 25 Jun 2002 12:20:34 -0000 1.3
+++ switch_door.cxx 1 Jul 2002 18:36:40 -0000 1.4
@@ -222,7 +222,7 @@
return "--- EditorSwitchDoorSwitchObj ---";
}
-boost::shared_ptr<EditorObj>
+EditorObj*
EditorSwitchDoorSwitchObj::duplicate()
{
return door->duplicate ();
@@ -239,11 +239,11 @@
door_tile = PingusResource::load_surface("switchdoor_tile", "worldobjs");
}
-boost::shared_ptr<EditorObj>
+EditorObj*
EditorSwitchDoorObj::duplicate()
{
std::cout << "EditorSwitchDoorObj::duplicate(): not implemented" <<
std::endl;
- return boost::shared_ptr<EditorObj> ();
+ return 0;
}
/** Create this object (and child objects) with resonable defaults
Index: switch_door.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- switch_door.hxx 25 Jun 2002 12:20:34 -0000 1.4
+++ switch_door.hxx 1 Jul 2002 18:36:40 -0000 1.5
@@ -96,7 +96,7 @@
public:
EditorSwitchDoorSwitchObj (EditorSwitchDoorObj* data);
- boost::shared_ptr<EditorObj> duplicate();
+ EditorObj* duplicate();
void write_xml (std::ostream& /*xml*/) {}
std::string status_line();
@@ -118,7 +118,7 @@
for the editor */
static std::list<boost::shared_ptr<EditorObj> > create (const CL_Vector&
pos);
- boost::shared_ptr<EditorObj> duplicate();
+ EditorObj* duplicate();
float get_z_pos() { return door_pos.z; }
int get_width() { return door_box.get_width (); }
Index: teleporter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/teleporter.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- teleporter.cxx 25 Jun 2002 12:20:34 -0000 1.2
+++ teleporter.cxx 1 Jul 2002 18:36:40 -0000 1.3
@@ -163,11 +163,11 @@
target_pos = data.target_pos;
}
-boost::shared_ptr<EditorObj>
+EditorObj*
EditorTeleporterObj::duplicate()
{
std::cout << "EditorTeleporterObj::duplicate(): not implemented" <<
std::endl;
- return boost::shared_ptr<EditorObj> ();
+ return 0;
}
std::list<boost::shared_ptr<EditorObj> >
Index: teleporter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/teleporter.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- teleporter.hxx 25 Jun 2002 12:20:34 -0000 1.4
+++ teleporter.hxx 1 Jul 2002 18:36:40 -0000 1.5
@@ -83,7 +83,7 @@
CL_Vector& get_target_pos_ref () { return target_pos; }
- boost::shared_ptr<EditorObj> duplicate();
+ EditorObj* duplicate();
static std::list<boost::shared_ptr<EditorObj> > create (const
TeleporterData& data);
void write_xml(std::ostream& xml) { TeleporterData::write_xml(xml); }
@@ -111,7 +111,7 @@
EditorTeleporterTargetObj (EditorTeleporterObj* obj);
virtual ~EditorTeleporterTargetObj () {}
- boost::shared_ptr<EditorObj> duplicate() { return teleporter->duplicate (); }
+ EditorObj* duplicate() { return teleporter->duplicate (); }
/// The saving will be done in EditorTeleporterObj::save_xml
void write_xml (std::ostream& /*xml*/) {}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs conveyor_belt.cxx,1.3,1.4 conveyor_belt.hxx,1.3,1.4 ice_block.cxx,1.5,1.6 ice_block.hxx,1.3,1.4 info_box.cxx,1.2,1.3 info_box.hxx,1.4,1.5 switch_door.cxx,1.3,1.4 switch_door.hxx,1.4,1.5 teleporter.cxx,1.2,1.3 teleporter.hxx,1.4,1.5,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src editor_hotspot.hxx,1.3,1.4 worldobj_group_data.cxx,1.4,1.5
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.19,1.20 editor_groundpiece_obj.cxx,1.7,1.8 editor_groundpiece_obj.hxx,1.6,1.7 editorobj.hxx,1.8,1.9 editorobj_group.cxx,1.3,1.4 editorobj_group.hxx,1.6,1.7 object_manager.cxx,1.16,1.17 object_manager.hxx,1.9,1.10 plfobj.cxx,1.4,1.5 plfobj.hxx,1.5,1.6 selection.cxx,1.4,1.5 selection.hxx,1.4,1.5 start_pos.cxx,1.3,1.4 start_pos.hxx,1.3,1.4 weather_obj.cxx,1.3,1.4 weather_obj.hxx,1.3,1.4
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src editor_hotspot.hxx,1.3,1.4 worldobj_group_data.cxx,1.4,1.5
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.19,1.20 editor_groundpiece_obj.cxx,1.7,1.8 editor_groundpiece_obj.hxx,1.6,1.7 editorobj.hxx,1.8,1.9 editorobj_group.cxx,1.3,1.4 editorobj_group.hxx,1.6,1.7 object_manager.cxx,1.16,1.17 object_manager.hxx,1.9,1.10 plfobj.cxx,1.4,1.5 plfobj.hxx,1.5,1.6 selection.cxx,1.4,1.5 selection.hxx,1.4,1.5 start_pos.cxx,1.3,1.4 start_pos.hxx,1.3,1.4 weather_obj.cxx,1.3,1.4 weather_obj.hxx,1.3,1.4
- Index(es):