[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.1,1.2 bumper_obj.hxx,1.1,1.2 fake_exit_obj.cxx,1.1,1.2 fake_exit_obj.hxx,1.1,1.2 guillotine_obj.cxx,1.1,1.2 guillotine_obj.hxx,1.1,1.2 hammer_obj.cxx,1.1,1.2 hammer_obj.hxx,1.1,1.2 laser_exit_obj.cxx,1.1,1.2 laser_exit_obj.hxx,1.1,1.2 smasher_obj.cxx,1.1,1.2 smasher_obj.hxx,1.1,1.2 spike_obj.cxx,1.1,1.2 spike_obj.hxx,1.1,1.2

[grumbel]

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

Modified Files:
        bumper_obj.cxx bumper_obj.hxx fake_exit_obj.cxx 
        fake_exit_obj.hxx guillotine_obj.cxx guillotine_obj.hxx 
        hammer_obj.cxx hammer_obj.hxx laser_exit_obj.cxx 
        laser_exit_obj.hxx smasher_obj.cxx smasher_obj.hxx 
        spike_obj.cxx spike_obj.hxx 
Log Message:
- fixed trap in the editor (well, moving them is still broken now)
- some worldmap rewrite stuff, completly #ifdef'ed out at the moment

Index: bumper_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bumper_obj.cxx      4 Sep 2002 14:55:12 -0000       1.1
+++ bumper_obj.cxx      8 Sep 2002 18:13:04 -0000       1.2
@@ -37,6 +37,16 @@
     delete data;
   }
   
+EditorObjLst
+BumperObj::create (const CL_Vector& pos)
+{
+  EditorObjLst lst;
+  WorldObjsData::BumperData data;
+  data.pos = pos;
+  lst.push_back (new BumperObj (&data));
+  return lst;
+}
+
   EditorObj*
   BumperObj::duplicate ()
   {

Index: bumper_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bumper_obj.hxx      4 Sep 2002 14:55:12 -0000       1.1
+++ bumper_obj.hxx      8 Sep 2002 18:13:04 -0000       1.2
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOROBJS_BUMPER_OBJ_HXX
 
 #include "../editor/sprite_editorobj.hxx"
+#include "../worldobj_data.hxx"
 
 namespace WorldObjsData {
   class BumperData;
@@ -36,8 +37,10 @@
     
     public:
       BumperObj (WorldObjsData::BumperData* data_);
-     ~BumperObj ();
-     
+     ~BumperObj ();   
+
+    static EditorObjLst create (const CL_Vector& pos);
+
       EditorObj* duplicate ();
       
       void write_xml (std::ostream& xml);

Index: fake_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fake_exit_obj.cxx   4 Sep 2002 14:55:12 -0000       1.1
+++ fake_exit_obj.cxx   8 Sep 2002 18:13:04 -0000       1.2
@@ -36,6 +36,16 @@
   {
     delete data;
   }
+
+EditorObjLst
+FakeExitObj::create (const CL_Vector& pos)
+{
+  EditorObjLst lst;
+  WorldObjsData::FakeExitData data;
+  data.pos = pos;
+  lst.push_back (new FakeExitObj (&data));
+  return lst;
+}
   
   EditorObj*
   FakeExitObj::duplicate ()

Index: fake_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fake_exit_obj.hxx   4 Sep 2002 14:55:12 -0000       1.1
+++ fake_exit_obj.hxx   8 Sep 2002 18:13:04 -0000       1.2
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOROBJS_FAKE_EXIT_OBJ_HXX
 
 #include "../editor/sprite_editorobj.hxx"
+#include "../worldobj_data.hxx"
 
 namespace WorldObjsData {
   class FakeExitData;
@@ -38,6 +39,8 @@
       FakeExitObj (WorldObjsData::FakeExitData* data_);
      ~FakeExitObj ();
      
+    static EditorObjLst create (const CL_Vector& pos);
+
       EditorObj* duplicate ();
       
       void write_xml (std::ostream& xml);

Index: guillotine_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- guillotine_obj.cxx  4 Sep 2002 14:55:12 -0000       1.1
+++ guillotine_obj.cxx  8 Sep 2002 18:13:04 -0000       1.2
@@ -35,6 +35,16 @@
   {
     delete data;
   }
+
+EditorObjLst
+GuillotineObj::create (const CL_Vector& pos)
+{
+  EditorObjLst lst;
+  WorldObjsData::GuillotineData data;
+  data.pos = pos;
+  lst.push_back (new GuillotineObj (&data));
+  return lst;
+}
   
   EditorObj*
   GuillotineObj::duplicate ()

Index: guillotine_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- guillotine_obj.hxx  4 Sep 2002 14:55:12 -0000       1.1
+++ guillotine_obj.hxx  8 Sep 2002 18:13:04 -0000       1.2
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOROBJS_GUILLOTINE_OBJ_HXX
 
 #include "../editor/sprite_editorobj.hxx"
+#include "../worldobj_data.hxx"
 
 namespace WorldObjsData {
   class GuillotineData;
@@ -38,6 +39,8 @@
       GuillotineObj (WorldObjsData::GuillotineData* data_);
      ~GuillotineObj ();
      
+    static EditorObjLst create (const CL_Vector& pos);
+
       EditorObj* duplicate ();
       
       void write_xml (std::ostream& xml);

Index: hammer_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hammer_obj.cxx      4 Sep 2002 14:55:12 -0000       1.1
+++ hammer_obj.cxx      8 Sep 2002 18:13:04 -0000       1.2
@@ -42,6 +42,16 @@
   {
     return new HammerObj(data);
   }
+
+EditorObjLst
+HammerObj::create (const CL_Vector& pos)
+{
+  EditorObjLst lst;
+  WorldObjsData::HammerData hammer_data;
+  hammer_data.pos = pos;
+  lst.push_back (new HammerObj (&hammer_data));
+  return lst;
+}
   
   void
   HammerObj::write_xml (std::ostream& xml)

Index: hammer_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hammer_obj.hxx      4 Sep 2002 14:55:12 -0000       1.1
+++ hammer_obj.hxx      8 Sep 2002 18:13:04 -0000       1.2
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOROBJS_HAMMER_OBJ_HXX
 
 #include "../editor/sprite_editorobj.hxx"
+#include "../worldobj_data.hxx"
 
 namespace WorldObjsData {
   class HammerData;
@@ -38,6 +39,8 @@
       HammerObj (WorldObjsData::HammerData* data_);
      ~HammerObj ();
      
+    static EditorObjLst create (const CL_Vector& pos);
+
       EditorObj* duplicate ();
       
       void write_xml (std::ostream& xml);

Index: laser_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- laser_exit_obj.cxx  4 Sep 2002 14:55:12 -0000       1.1
+++ laser_exit_obj.cxx  8 Sep 2002 18:13:04 -0000       1.2
@@ -36,8 +36,18 @@
   {
     delete data;
   }
-  
-  EditorObj*
+
+EditorObjLst
+LaserExitObj::create (const CL_Vector& pos)
+{
+  EditorObjLst lst;
+  WorldObjsData::LaserExitData data;
+  data.pos = pos;
+  lst.push_back (new LaserExitObj (&data));
+  return lst;
+}
+
+EditorObj*
   LaserExitObj::duplicate ()
   {
     return new LaserExitObj(data);

Index: laser_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- laser_exit_obj.hxx  4 Sep 2002 14:55:12 -0000       1.1
+++ laser_exit_obj.hxx  8 Sep 2002 18:13:04 -0000       1.2
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOROBJS_LASER_EXIT_OBJ_HXX
 
 #include "../editor/sprite_editorobj.hxx"
+#include "../worldobj_data.hxx"
 
 namespace WorldObjsData {
   class LaserExitData;
@@ -37,6 +38,9 @@
     public:
       LaserExitObj (WorldObjsData::LaserExitData* data_);
      ~LaserExitObj ();
+
+    static EditorObjLst create (const CL_Vector& pos);
+
      
       EditorObj* duplicate ();
       

Index: smasher_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- smasher_obj.cxx     4 Sep 2002 14:55:12 -0000       1.1
+++ smasher_obj.cxx     8 Sep 2002 18:13:04 -0000       1.2
@@ -35,6 +35,16 @@
   {
     delete data;
   }
+
+EditorObjLst
+SmasherObj::create (const CL_Vector& pos)
+{
+  EditorObjLst lst;
+  WorldObjsData::SmasherData smasher_data;
+  smasher_data.pos = pos;
+  lst.push_back (new SmasherObj (&smasher_data));
+  return lst;
+}
   
   EditorObj*
   SmasherObj::duplicate ()

Index: smasher_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- smasher_obj.hxx     4 Sep 2002 14:55:12 -0000       1.1
+++ smasher_obj.hxx     8 Sep 2002 18:13:04 -0000       1.2
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOROBJS_SMASHER_OBJ_HXX
 
 #include "../editor/sprite_editorobj.hxx"
+#include "../worldobj_data.hxx"
 
 namespace WorldObjsData {
   class SmasherData;
@@ -37,6 +38,8 @@
     public:
       SmasherObj (WorldObjsData::SmasherData* data_);
      ~SmasherObj ();
+
+    static EditorObjLst create (const CL_Vector& pos);
      
       EditorObj* duplicate ();
       

Index: spike_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- spike_obj.cxx       4 Sep 2002 14:55:12 -0000       1.1
+++ spike_obj.cxx       8 Sep 2002 18:13:04 -0000       1.2
@@ -35,6 +35,16 @@
   {
     delete data;
   }
+
+EditorObjLst
+SpikeObj::create (const CL_Vector& pos)
+{
+  EditorObjLst lst;
+  WorldObjsData::SpikeData spike_data;
+  spike_data.pos = pos;
+  lst.push_back (new SpikeObj (&spike_data));
+  return lst;
+}
   
   EditorObj*
   SpikeObj::duplicate ()

Index: spike_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- spike_obj.hxx       4 Sep 2002 14:55:12 -0000       1.1
+++ spike_obj.hxx       8 Sep 2002 18:13:04 -0000       1.2
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOROBJS_SPIKE_OBJ_HXX
 
 #include "../editor/sprite_editorobj.hxx"
+#include "../worldobj_data.hxx"
 
 namespace WorldObjsData {
   class SpikeData;
@@ -38,6 +39,8 @@
       SpikeObj (WorldObjsData::SpikeData* data_);
      ~SpikeObj ();
      
+    static EditorObjLst create (const CL_Vector& pos);
+
       EditorObj* duplicate ();
       
       void write_xml (std::ostream& xml);