[Pingus-CVS] CVS: Games/Pingus/src prefab.cxx,1.3,1.4 worldobj_data_factory.cxx,1.13,1.14 xml_plf.cxx,1.15,1.16

[grumbel]

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

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

Index: prefab.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/prefab.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- prefab.cxx  15 Sep 2002 20:33:45 -0000      1.3
+++ prefab.cxx  15 Sep 2002 21:21:47 -0000      1.4
@@ -102,4 +102,29 @@
   return new Prefab (path_manager.complete ("prefab/") + uid);
 }
 
+std::string
+Prefab::get_name ()
+{
+  return name;
+}
+
+std::string
+Prefab::get_uid ()
+{
+  return uid;
+}
+
+std::string
+Prefab::get_description ()
+{
+  return description;
+}
+
+WorldObjData*
+Prefab::get_data ()
+{
+  return data;
+}
+
+
 /* EOF */

Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- worldobj_data_factory.cxx   15 Sep 2002 20:33:45 -0000      1.13
+++ worldobj_data_factory.cxx   15 Sep 2002 21:21:47 -0000      1.14
@@ -107,7 +107,22 @@
     }
   else
     {
-      PingusError::raise ("WorldObjDataFactory::create: Error, no type 
given.");
+      // Compatibility stuff
+      if (XMLhelper::equal_str(cur->name, "hotspot"))
+       {
+         return create ("hotspot", doc, cur);
+       }
+      else if (XMLhelper::equal_str(cur->name, "exit"))
+       {
+         return create ("exit", doc, cur);
+       }
+      else if (XMLhelper::equal_str(cur->name, "entrance"))
+       {
+         return create ("entrance", doc, cur);
+       }
+      else
+       PingusError::raise ("WorldObjDataFactory::create: Error, no type given. 
- " 
+                           + std::string((char*) cur->name));
     }
     
   return 0; //never reached

Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- xml_plf.cxx 15 Sep 2002 20:33:45 -0000      1.15
+++ xml_plf.cxx 15 Sep 2002 21:21:47 -0000      1.16
@@ -29,6 +29,7 @@
 #include "entrance_data.hxx"
 #include "hotspot_data.hxx"
 #include "liquid_data.hxx"
+#include "worldobjsdata/worldobj_group_data.hxx"
 
 using namespace std;
 using Actions::action_from_string;
@@ -138,7 +139,7 @@
            }
          else if (XMLhelper::equal_str(cur->name, "group"))
            {
-             worldobjs_data.push_back (new WorldObjGroupData (doc, cur));
+             worldobjs_data.push_back (new WorldObjsData::WorldObjGroupData 
(doc, cur));
            }
          else if (XMLhelper::equal_str(cur->name, "start-position"))
            {