[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata Makefile.am,1.6,1.7 prefab_obj_data.cxx,1.1,1.2 prefab_obj_data.hxx,1.1,1.2

[grumbel]

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

Modified Files:
        Makefile.am prefab_obj_data.cxx prefab_obj_data.hxx 
Log Message:
hooked up the prefab stuff into the makefiles

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am 15 Sep 2002 09:54:34 -0000      1.6
+++ Makefile.am 15 Sep 2002 16:49:20 -0000      1.7
@@ -26,6 +26,7 @@
        ice_block_data.cxx              ice_block_data.hxx \
        info_box_data.cxx               info_box_data.hxx \
        laser_exit_data.cxx             laser_exit_data.hxx \
+        prefab_obj_data.cxx                 prefab_obj_data.hxx \
        smasher_data.cxx                smasher_data.hxx \
        solid_color_background_data.cxx solid_color_background_data.hxx \
        spike_data.cxx                  spike_data.hxx  \

Index: prefab_obj_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prefab_obj_data.cxx 15 Sep 2002 15:30:21 -0000      1.1
+++ prefab_obj_data.cxx 15 Sep 2002 16:49:20 -0000      1.2
@@ -17,22 +17,27 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "../prefab.hxx"
 #include "prefab_obj_data.hxx"
 
-PrefabData::PrefabData (xmlDocPtr doc, xmlNodePtr cur)
+namespace WorldObjsData {
+
+PrefabObjData::PrefabObjData (xmlDocPtr doc, xmlNodePtr cur)
 {
 }
 
 WorldObj*
-PrefabData::create_WorldObj ()
+PrefabObjData::create_WorldObj ()
 {
-  return data->create_EditorObj ();
+  return 0; //data->create_EditorObj ();
 }
 
 EditorObjLst
-create_EditorObj ()
+PrefabObjData::create_EditorObj ()
 {
-  return data->create_EditorObj ();
+  return EditorObjLst (); //data->create_EditorObj ();
 }
+
+} // namespace WorldObjsData
 
 /* EOF */

Index: prefab_obj_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prefab_obj_data.hxx 15 Sep 2002 15:30:21 -0000      1.1
+++ prefab_obj_data.hxx 15 Sep 2002 16:49:20 -0000      1.2
@@ -20,8 +20,11 @@
 #ifndef HEADER_PREFAB_DATA_HXX
 #define HEADER_PREFAB_DATA_HXX
 
-#include "libxmlfwd.hxx"
-#include "worldobj_data.hxx"
+#include <ClanLib/Core/Math/cl_vector.h>
+#include "../libxmlfwd.hxx"
+#include "../worldobj_data.hxx"
+
+class Prefab;
 
 namespace WorldObjsData {
 
@@ -48,7 +51,7 @@
       of this object, since it can be consturcted from the name) */
   Prefab* data;
 
-  PrefabData (xmlDocPtr doc, xmlNodePtr cur);
+  PrefabObjData (xmlDocPtr doc, xmlNodePtr cur);
 
   /** The PrefabData is flattened to a WorldObjGroup, the World
       doesn't need to keep track of prefabs */
@@ -58,8 +61,8 @@
   EditorObjLst create_EditorObj ();
 
 private:
-  PrefabData (const PrefabData&);
-  PrefabData operator= (const PrefabData&);
+  PrefabObjData (const PrefabObjData&);
+  PrefabObjData operator= (const PrefabObjData&);
 };
 
 } // namespace WorldObjsData