[Pingus-CVS] CVS: Games/Pingus/src/editor ObjectManager.cc,1.61,1.62

[torangan]

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

Modified Files:
        ObjectManager.cc 
Log Message:
changed usage of ListHelper to regular STL method calls


Index: ObjectManager.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectManager.cc,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- ObjectManager.cc    7 Jun 2002 14:50:34 -0000       1.61
+++ ObjectManager.cc    7 Jun 2002 19:10:33 -0000       1.62
@@ -32,7 +32,6 @@
 #include "../backgrounds/SurfaceBackgroundData.hh"
 #include "../WorldObjData.hh"
 #include "StartPos.hh"
-#include "../generic/ListHelper.hh"
 #include "ObjectManager.hh"
 #include "EditorObj.hh"
 #include "EditorView.hh"
@@ -160,16 +159,23 @@
   vector<WeatherData>  temp_weather  = plf->get_weather();
   vector<boost::shared_ptr<WorldObjData> > temp_worldobj = 
plf->get_worldobjs_data();
 
-  for (vector<GroundpieceData>::iterator i = temp_surfaces.begin(); i != 
temp_surfaces.end(); ++i)
-    ListHelper::append (editor_objs, i->create_EditorObj ());
+  for (vector<GroundpieceData>::iterator i = temp_surfaces.begin(); i != 
temp_surfaces.end(); ++i) {
+    const list<boost::shared_ptr<EditorObj> > & temp = i->create_EditorObj();
+    editor_objs.insert(editor_objs.end(), temp.begin(), temp.end() );
+  }
 
-  for (vector<WeatherData>::iterator i = temp_weather.begin(); i != 
temp_weather.end(); ++i)
-    ListHelper::append (editor_objs, i->create_EditorObj ());
+
+  for (vector<WeatherData>::iterator i = temp_weather.begin(); i != 
temp_weather.end(); ++i) {
+    const list<boost::shared_ptr<EditorObj> > & temp = i->create_EditorObj();
+    editor_objs.insert(editor_objs.end(), temp.begin(), temp.end() );
+  }
 
   for (vector<boost::shared_ptr<WorldObjData> >::iterator i = 
temp_worldobj.begin();
       i != temp_worldobj.end();
-      ++i)
-    ListHelper::append (editor_objs, (*i)->create_EditorObj ());
+      ++i) {
+    const list<boost::shared_ptr<EditorObj> > & temp = 
(*i)->create_EditorObj();
+    editor_objs.insert(editor_objs.end(), temp.begin(), temp.end() );
+  }
 
 #ifndef WIN32 // FIXME: Compiler error in Windows
   editor_objs.sort(EditorObj_z_pos_sorter());