[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata worldobj_group_data.cxx,1.1,1.2 worldobj_group_data.hxx,1.1,1.2

[grumbel]

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

Modified Files:
        worldobj_group_data.cxx worldobj_group_data.hxx 
Log Message:
- more prefab stuff, doesn't compile, can anybody stop the bug?

Index: worldobj_group_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- worldobj_group_data.cxx     15 Sep 2002 20:33:45 -0000      1.1
+++ worldobj_group_data.cxx     15 Sep 2002 21:21:47 -0000      1.2
@@ -17,20 +17,20 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <iostream>
 #include <fstream>
-#include "editor/editorobj_group.hxx"
-#include "xml_helper.hxx"
+#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 "worldobj_group_data.hxx"
-#include "worldobj_data_factory.hxx"
-
-// FIXME: Factory pattern for this would be nice
-#include "exit_data.hxx"
-#include "entrance_data.hxx"
-#include "hotspot_data.hxx"
-#include "liquid_data.hxx"
 
 typedef EditorObjLst::iterator EditorObjLstIter;
 
+namespace WorldObjsData {
 
 WorldObjGroupData::WorldObjGroupData ()
 {
@@ -41,14 +41,25 @@
   cur = cur->children;
 
   std::cout << "WorldObjGroupData::WorldObjGroupData (xmlDocPtr doc, 
xmlNodePtr cur)" << std::endl;
-
+  
+  cur = XMLhelper::skip_blank (cur->next);
+ 
   while (cur)
     {
-      cur = XMLhelper::skip_blank (cur->next);
       std::cout << "WorldObjGroupData: " << cur->name << std::endl;
       objs.push_back (WorldObjDataFactory::instance ()->create (doc, cur));
       cur = cur->next;
+      cur = XMLhelper::skip_blank (cur->next);
     }
+  
+  std::cout << "WorldObjGroupData: size = " << objs.size () << std::endl;
+}
+
+WorldObjGroupData::WorldObjGroupData (const WorldObjGroupData& data)
+  : objs (data.objs)
+{
+  // FIXME: no deep copy
+  std::cout << "WorldObjGroupData::WorldObjGroupData (const 
WorldObjGroupData&): fixme no deep copy" << std::endl;
 }
 
 WorldObjGroupData::~WorldObjGroupData ()
@@ -73,12 +84,11 @@
   xml << "</group>\n\n";
 }
 
-/** Create an WorldObj from the given data object */
 WorldObj* 
 WorldObjGroupData::create_WorldObj ()
 {
-  std::cout << "WorldObjGroupData::create_WorldObj (): not implemented" << 
std::endl;
-  return NULL;
+  //return new WorldObjs::WorldObjGroup (*this);
+  return 0;
 }
 
 /** Create an EditorObj from the given data object */
@@ -100,5 +110,7 @@
 
   return lst;
 }
+
+} // namespace WorldObjsData
 
 /* EOF */

Index: worldobj_group_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- worldobj_group_data.hxx     15 Sep 2002 20:33:45 -0000      1.1
+++ worldobj_group_data.hxx     15 Sep 2002 21:21:47 -0000      1.2
@@ -23,6 +23,9 @@
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
 
+namespace WorldObjsData {
+
+/** */
 class WorldObjGroupData : public WorldObjData
 {
 private:
@@ -32,6 +35,8 @@
 public:
   WorldObjGroupData ();
   WorldObjGroupData (xmlDocPtr doc, xmlNodePtr cur);
+  WorldObjGroupData (const WorldObjGroupData&);
+
   ~WorldObjGroupData ();
 
   void add (WorldObjData*);
@@ -45,9 +50,10 @@
   EditorObjLst create_EditorObj ();
   
 private:
-  WorldObjGroupData (const WorldObjGroupData&);
   WorldObjGroupData operator= (const WorldObjGroupData&);
 };
+
+} // namespace WorldObjsData
 
 #endif