pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata worldobj_group_data.cxx


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata worldobj_group_data.cxx,1.2,1.3 worldobj_group_data.hxx,1.2,1.3
Date: 15 Sep 2002 21:50:00 -0000

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

Modified Files:
        worldobj_group_data.cxx worldobj_group_data.hxx 
Log Message:
- bug squashed... a typo in the namespace

Index: worldobj_group_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- worldobj_group_data.cxx     15 Sep 2002 21:21:47 -0000      1.2
+++ worldobj_group_data.cxx     15 Sep 2002 21:49:58 -0000      1.3
@@ -21,15 +21,10 @@
 #include <fstream>
 #include "../editor/editorobj_group.hxx"
 #include "../xml_helper.hxx"
-#include "../worldobjs/worldobj_group.hxx"
 #include "../worldobj_data_factory.hxx"
-#include "../worldobj.hxx"
-#include "../editor/editorobj_group.hxx"
-#include "../editor/editorobj.hxx"
+#include "../worldobjs/worldobj_group.hxx"
 #include "worldobj_group_data.hxx"
 
-typedef EditorObjLst::iterator EditorObjLstIter;
-
 namespace WorldObjsData {
 
 WorldObjGroupData::WorldObjGroupData ()
@@ -87,11 +82,9 @@
 WorldObj* 
 WorldObjGroupData::create_WorldObj ()
 {
-  //return new WorldObjs::WorldObjGroup (*this);
-  return 0;
+  return new WorldObjs::WorldObjGroup (*this);
 }
 
-/** Create an EditorObj from the given data object */
 EditorObjLst 
 WorldObjGroupData::create_EditorObj ()
 {
@@ -102,7 +95,7 @@
   for (ObjsIter i = objs.begin (); i != objs.end (); ++i)
     {
       EditorObjLst sublst ((*i)->create_EditorObj ());
-      for (EditorObjLstIter j = sublst.begin (); j != sublst.end (); ++j)
+      for (EditorObjLst::iterator j = sublst.begin (); j != sublst.end (); ++j)
        {
          group->add (*j);
        }

Index: worldobj_group_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- worldobj_group_data.hxx     15 Sep 2002 21:21:47 -0000      1.2
+++ worldobj_group_data.hxx     15 Sep 2002 21:49:58 -0000      1.3
@@ -20,8 +20,8 @@
 #ifndef HEADER_PINGUS_WORLDOBJ_GROUP_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJ_GROUP_DATA_HXX
 
-#include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
+#include "../worldobj_data.hxx"
 
 namespace WorldObjsData {
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]