[Pingus-CVS] CVS: Games/Pingus/src prefab.cxx,1.4,1.5 prefab.hxx,1.4,1.5 worldobj_data.hxx,1.9,1.10 worldobj_data_factory.cxx,1.30,1.31 xml_plf.cxx,1.33,1.34

[grumbel]

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

Modified Files:
        prefab.cxx prefab.hxx worldobj_data.hxx 
        worldobj_data_factory.cxx xml_plf.cxx 
Log Message:
- fixed object group loading in the editor


Index: prefab.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/prefab.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prefab.cxx  15 Sep 2002 21:21:47 -0000      1.4
+++ prefab.cxx  5 Mar 2003 19:13:59 -0000       1.5
@@ -53,9 +53,9 @@
                {
                  description = XMLhelper::parse_string (doc, cur);
                }
-             else if (XMLhelper::equal_str (cur->name, "uid"))
+             else if (XMLhelper::equal_str (cur->name, "type"))
                {
-                 uid = XMLhelper::parse_string (doc, cur);
+                 type = XMLhelper::parse_string (doc, cur);
                }
              else if (XMLhelper::equal_str (cur->name, "thumbnail"))
                {
@@ -97,9 +97,9 @@
 }
 
 Prefab*
-Prefab::create (const std::string& uid)
+Prefab::create (const std::string& type)
 {
-  return new Prefab (path_manager.complete ("prefab/") + uid);
+  return new Prefab (path_manager.complete ("prefab/") + type);
 }
 
 std::string
@@ -109,9 +109,9 @@
 }
 
 std::string
-Prefab::get_uid ()
+Prefab::get_type ()
 {
-  return uid;
+  return type;
 }
 
 std::string

Index: prefab.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/prefab.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prefab.hxx  27 Sep 2002 11:26:44 -0000      1.4
+++ prefab.hxx  5 Mar 2003 19:13:59 -0000       1.5
@@ -38,7 +38,7 @@
 
   std::string name;
   std::string description;
-  std::string uid;
+  std::string type;
 public:
   /** Create a Prefab object from a given prefab description file
       @param filename The fully qualitfied filename of the prefab
@@ -59,7 +59,7 @@
   std::string get_name ();
 
   /** @return the uniq identifer of this prefab */
-  std::string get_uid ();
+  std::string get_type ();
 
   /** @return a description of this prefab, where and how it should be
       used and things like that. */

Index: worldobj_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- worldobj_data.hxx   4 Mar 2003 12:53:46 -0000       1.9
+++ worldobj_data.hxx   5 Mar 2003 19:13:59 -0000       1.10
@@ -27,7 +27,7 @@
 class EditorObj;
 
 namespace EditorNS {
-class ObjectManager;
+class EditorObjMgr;
 }
 
 typedef std::vector<EditorObj*> EditorObjLst;
@@ -61,7 +61,7 @@
 
   /** Create an EditorObj from the given data object, caller is
       responible for deleting the pointers in the vector */
-  virtual void insert_EditorObjs (EditorNS::ObjectManager*) =0;
+  virtual void insert_EditorObjs (EditorNS::EditorObjMgr*) =0;
 };
 
 #endif

Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- worldobj_data_factory.cxx   18 Feb 2003 11:28:41 -0000      1.30
+++ worldobj_data_factory.cxx   5 Mar 2003 19:13:59 -0000       1.31
@@ -129,6 +129,10 @@
     {
       return create ("groundpiece", doc, cur);
     }
+  else if (XMLhelper::equal_str(cur->name, "group"))
+    {
+      return create ("group", doc, cur);
+    }
   else
     {
       std::string type;

Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- xml_plf.cxx 19 Feb 2003 11:33:00 -0000      1.33
+++ xml_plf.cxx 5 Mar 2003 19:13:59 -0000       1.34
@@ -150,8 +150,9 @@
            }
          else if (XMLhelper::equal_str(cur->name, "group"))
            {
+              
worldobjs_data.push_back(WorldObjDataFactory::instance()->create(doc, cur));
              //worldobjs_data.push_back (new WorldObjsData::WorldObjGroupData 
(doc, cur));
-             parse_group (cur);
+             //parse_group (cur);
            }
          else if (XMLhelper::equal_str(cur->name, "start-position"))
            {