[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor ObjectManager.cc,1.63,1.64
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor ObjectManager.cc,1.63,1.64 |
Date: |
9 Jun 2002 13:03:13 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv9453/editor
Modified Files:
ObjectManager.cc
Log Message:
- replaced shared_ptr<WorldObjData> with WorldObjData*
- the changes trigger a bug in the owner_id, which causes it to be
uninitialized, not sure if my new code causes this, or just triggers it (since
I have seen that before)
Index: ObjectManager.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectManager.cc,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- ObjectManager.cc 8 Jun 2002 23:11:08 -0000 1.63
+++ ObjectManager.cc 9 Jun 2002 13:03:11 -0000 1.64
@@ -152,7 +152,7 @@
}
vector<WeatherData> temp_weather = plf->get_weather();
- vector<boost::shared_ptr<WorldObjData> > temp_worldobj =
plf->get_worldobjs_data();
+ vector<WorldObjData*> temp_worldobj = plf->get_worldobjs_data();
for (vector<GroundpieceData>::iterator i = temp_surfaces.begin(); i !=
temp_surfaces.end(); ++i) {
const list<boost::shared_ptr<EditorObj> > & temp = i->create_EditorObj();
@@ -165,7 +165,7 @@
editor_objs.insert(editor_objs.end(), temp.begin(), temp.end() );
}
- for (vector<boost::shared_ptr<WorldObjData> >::iterator i =
temp_worldobj.begin();
+ for (vector<WorldObjData*>::iterator i = temp_worldobj.begin();
i != temp_worldobj.end();
++i) {
const list<boost::shared_ptr<EditorObj> > & temp =
(*i)->create_EditorObj();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor ObjectManager.cc,1.63,1.64,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src CaptureRectangle.cc,1.20,1.21 Entrance.cc,1.29,1.30 Pingu.cc,1.75,1.76 PinguAction.cc,1.25,1.26 PinguActionFactory.cc,1.5,1.6 PinguHolder.cc,1.20,1.21 Theme.cc,1.34,1.35 View.cc,1.18,1.19
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds SolidColorBackground.cc,1.13,1.14 SolidColorBackground.hh,1.16,1.17 StarfieldBackground.cc,1.20,1.21 StarfieldBackground.hh,1.16,1.17 SurfaceBackgroundData.cc,1.18,1.19 SurfaceBackgroundData.hh,1.15,1.16 ThunderstormBackgroundData.cc,1.11,1.12 ThunderstormBackgroundData.hh,1.8,1.9
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src CaptureRectangle.cc,1.20,1.21 Entrance.cc,1.29,1.30 Pingu.cc,1.75,1.76 PinguAction.cc,1.25,1.26 PinguActionFactory.cc,1.5,1.6 PinguHolder.cc,1.20,1.21 Theme.cc,1.34,1.35 View.cc,1.18,1.19
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds SolidColorBackground.cc,1.13,1.14 SolidColorBackground.hh,1.16,1.17 StarfieldBackground.cc,1.20,1.21 StarfieldBackground.hh,1.16,1.17 SurfaceBackgroundData.cc,1.18,1.19 SurfaceBackgroundData.hh,1.15,1.16 ThunderstormBackgroundData.cc,1.11,1.12 ThunderstormBackgroundData.hh,1.8,1.9
- Index(es):