[Pingus-CVS] CVS: Games/Pingus/src/editor editorobj_group.cxx,1.7,1.8 editorobj_group.hxx,1.13,1.14 object_manager.hxx,1.26,1.27

[grumbel]

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

Modified Files:
        editorobj_group.cxx editorobj_group.hxx object_manager.hxx 
Log Message:
- fixed object group loading in the editor


Index: editorobj_group.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj_group.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- editorobj_group.cxx 4 Oct 2002 11:38:29 -0000       1.7
+++ editorobj_group.cxx 5 Mar 2003 19:13:59 -0000       1.8
@@ -141,6 +141,7 @@
     {
       (*i)->write_xml(xml);
     }
+
   xml << "</group>\n" << std::endl;
 }
 
@@ -157,6 +158,7 @@
       if (obj)
        editor_obj->objs.push_back(obj);
     }
+
   return editor_obj;
 }
 

Index: editorobj_group.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj_group.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- editorobj_group.hxx 28 Nov 2002 20:09:54 -0000      1.13
+++ editorobj_group.hxx 5 Mar 2003 19:13:59 -0000       1.14
@@ -23,8 +23,11 @@
 #include <vector>
 #include "../vector.hxx"
 #include "editorobj.hxx"
+#include "editorobj_mgr.hxx"
 
-class EditorObjGroup : public EditorObj
+class EditorObjGroup 
+  : public EditorObj,
+    public EditorNS::EditorObjMgr
 {
 private:
   std::vector<EditorObj*> objs;
@@ -66,6 +69,3 @@
 #endif
 
 /* EOF */
-
-
-

Index: object_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.hxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- object_manager.hxx  19 Feb 2003 11:33:00 -0000      1.26
+++ object_manager.hxx  5 Mar 2003 19:13:59 -0000       1.27
@@ -24,6 +24,7 @@
 #include "../color.hxx"
 #include "../action_data.hxx"
 #include "editorobj.hxx"
+#include "editorobj_mgr.hxx"
 
 namespace EditorNS {
 
@@ -31,7 +32,7 @@
 
 /** Manager for all level objects. This class is kind of analog to the
     World. */
-class ObjectManager
+class ObjectManager : public EditorObjMgr
 {
 private:
   // FIXME: The object manager should really not have these friends,
@@ -70,7 +71,7 @@
   typedef std::vector<EditorObj*>::reverse_iterator EditorObjRIter;
 
   ObjectManager();
-  ~ObjectManager();
+  virtual ~ObjectManager();
 
   /// Create a new level
   void new_level ();