[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.4,1.5 fake_exit_obj.cxx,1.5,1.6 guillotine_obj.cxx,1.4,1.5 hammer_obj.cxx,1.4,1.5 laser_exit_obj.cxx,1.4,1.5 smasher_obj.cxx,1.4,1.5 smasher_obj.hxx,1.3,1.4 spike_obj.cxx,1.4,1.5 teleporter_obj.cxx,1.2,1.3 teleporter_target_obj.cxx,1.1,1.2

[grumbel]

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

Modified Files:
        bumper_obj.cxx fake_exit_obj.cxx guillotine_obj.cxx 
        hammer_obj.cxx laser_exit_obj.cxx smasher_obj.cxx 
        smasher_obj.hxx spike_obj.cxx teleporter_obj.cxx 
        teleporter_target_obj.cxx 
Log Message:
well, not a nice fix for the SpriteObj reference problem, but a working one.
a better solution might be to sync the position data of spriteobj and the 
editorobj on a write call, since its not needed before

Index: bumper_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bumper_obj.cxx      9 Sep 2002 16:13:44 -0000       1.4
+++ bumper_obj.cxx      10 Sep 2002 14:33:07 -0000      1.5
@@ -24,13 +24,15 @@
 
 namespace EditorObjs {
 
-BumperObj::BumperObj (WorldObjsData::BumperData* data_) : 
SpriteEditorObj(data_->pos),
-                                                          frame(0),
-                                                          data(new 
WorldObjsData::BumperData(*data_))
+BumperObj::BumperObj (WorldObjsData::BumperData* data_)
+  : frame(0),
+    data(new WorldObjsData::BumperData(*data_))
 {
   data->pos.z = -100;
   sprite = Sprite("Traps/bumper", "traps");
   sprite.set_align_center_bottom ();
+
+  pos_ref = &data->pos;
 }
 
 BumperObj::~BumperObj ()

Index: fake_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fake_exit_obj.cxx   9 Sep 2002 16:55:07 -0000       1.5
+++ fake_exit_obj.cxx   10 Sep 2002 14:33:07 -0000      1.6
@@ -25,13 +25,14 @@
 namespace EditorObjs {
 
 FakeExitObj::FakeExitObj (WorldObjsData::FakeExitData* data_) 
-  : SpriteEditorObj(data_->pos),
-    frame(0),
+  : frame(0),
     data(new WorldObjsData::FakeExitData(*data_))
 {
   data->pos.z = -100;
   sprite = Sprite("Traps/fake_exit", "traps");
   sprite.set_align_center_bottom ();
+
+  pos_ref = &data->pos;
 }
 
 FakeExitObj::~FakeExitObj ()

Index: guillotine_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- guillotine_obj.cxx  9 Sep 2002 16:13:44 -0000       1.4
+++ guillotine_obj.cxx  10 Sep 2002 14:33:07 -0000      1.5
@@ -24,12 +24,13 @@
 
 namespace EditorObjs {
 
-GuillotineObj::GuillotineObj (WorldObjsData::GuillotineData* data_) : 
SpriteEditorObj(data_->pos),
-                                                                      frame(0),
-                                                                      data(new 
WorldObjsData::GuillotineData(*data_))
+GuillotineObj::GuillotineObj (WorldObjsData::GuillotineData* data_)
+  : frame(0),
+    data(new WorldObjsData::GuillotineData(*data_))
 {
   data->pos.z = -100;
   sprite = Sprite("Traps/guillotineidle", "traps");
+  pos_ref = &data->pos;
 }
 
 GuillotineObj::~GuillotineObj ()

Index: hammer_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hammer_obj.cxx      9 Sep 2002 16:13:44 -0000       1.4
+++ hammer_obj.cxx      10 Sep 2002 14:33:07 -0000      1.5
@@ -24,13 +24,14 @@
 
 namespace EditorObjs {
 
-HammerObj::HammerObj (WorldObjsData::HammerData* data_) : 
SpriteEditorObj(data_->pos),
-                                                          frame(0),
-                                                          data(new 
WorldObjsData::HammerData(*data_))
+HammerObj::HammerObj (WorldObjsData::HammerData* data_) 
+  : frame(0),
+    data(new WorldObjsData::HammerData(*data_))
 {
   data->pos.z = -100;
   sprite = Sprite("Traps/hammer", "traps");
   sprite.set_align_center_bottom ();
+  pos_ref = &data->pos;
 }
 
 HammerObj::~HammerObj ()

Index: laser_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- laser_exit_obj.cxx  9 Sep 2002 16:13:44 -0000       1.4
+++ laser_exit_obj.cxx  10 Sep 2002 14:33:07 -0000      1.5
@@ -24,13 +24,14 @@
 
 namespace EditorObjs {
 
-LaserExitObj::LaserExitObj (WorldObjsData::LaserExitData* data_) : 
SpriteEditorObj(data_->pos),
-                                                                   frame(0),
-                                                                   data(new 
WorldObjsData::LaserExitData(*data_))
+LaserExitObj::LaserExitObj (WorldObjsData::LaserExitData* data_) 
+  : frame(0),
+    data(new WorldObjsData::LaserExitData(*data_))
 {
   data->pos.z = -100;
   sprite = Sprite("Traps/laser_exit", "traps");
   sprite.set_align_center_bottom ();
+  pos_ref = &data->pos;
 }
 
 LaserExitObj::~LaserExitObj ()

Index: smasher_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- smasher_obj.cxx     9 Sep 2002 16:13:44 -0000       1.4
+++ smasher_obj.cxx     10 Sep 2002 14:33:07 -0000      1.5
@@ -24,12 +24,13 @@
 
 namespace EditorObjs {
 
-SmasherObj::SmasherObj (WorldObjsData::SmasherData* data_) : 
SpriteEditorObj(data_->pos),
-                                                             frame(0),
-                                                             data(new 
WorldObjsData::SmasherData(*data_))
+SmasherObj::SmasherObj (const WorldObjsData::SmasherData& data_)
+  : frame(0),
+    data(new WorldObjsData::SmasherData(data_))
 {
   data->pos.z = -100;
   sprite = Sprite("Traps/smasher", "traps");
+  pos_ref = &data->pos;
 }
 
 SmasherObj::~SmasherObj ()
@@ -42,13 +43,13 @@
 {
   WorldObjsData::SmasherData smasher_data;
   smasher_data.pos = pos;
-  return EditorObjLst(1, new SmasherObj(&smasher_data));
+  return EditorObjLst(1, new SmasherObj(smasher_data));
 }
   
 EditorObj*
 SmasherObj::duplicate ()
 {
-  return new SmasherObj(data);
+  return new SmasherObj(*data);
 }
 
 void
@@ -71,6 +72,6 @@
   return str;
 }
   
-}
+} // namespace EditorObjs
 
 /* EOF */

Index: smasher_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smasher_obj.hxx     9 Sep 2002 16:13:44 -0000       1.3
+++ smasher_obj.hxx     10 Sep 2002 14:33:07 -0000      1.4
@@ -35,7 +35,7 @@
     WorldObjsData::SmasherData* const data;
   
   public:
-    SmasherObj (WorldObjsData::SmasherData* data_);
+    SmasherObj (const WorldObjsData::SmasherData& data_);
    ~SmasherObj ();
 
     static EditorObjLst create (const CL_Vector& pos);

Index: spike_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- spike_obj.cxx       9 Sep 2002 16:13:44 -0000       1.4
+++ spike_obj.cxx       10 Sep 2002 14:33:07 -0000      1.5
@@ -24,12 +24,13 @@
 
 namespace EditorObjs {
 
-SpikeObj::SpikeObj (WorldObjsData::SpikeData* data_) : 
SpriteEditorObj(data_->pos),
-                                                       frame(0),
-                                                       data(new 
WorldObjsData::SpikeData(*data_))
+SpikeObj::SpikeObj (WorldObjsData::SpikeData* data_) 
+  : frame(0),
+    data(new WorldObjsData::SpikeData(*data_))
 {
   data->pos.z = -100;
   sprite = Sprite("Traps/spike", "traps");
+  pos_ref = &(data->pos);
 }
 
 SpikeObj::~SpikeObj ()

Index: teleporter_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/teleporter_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- teleporter_obj.cxx  10 Sep 2002 12:46:55 -0000      1.2
+++ teleporter_obj.cxx  10 Sep 2002 14:33:07 -0000      1.3
@@ -26,10 +26,11 @@
 namespace EditorObjs {
 
 TeleporterObj::TeleporterObj (WorldObjsData::TeleporterData* data_)
-                            : SpriteEditorObj ("teleporter", "worldobjs", 
data->pos),
+                            : SpriteEditorObj ("teleporter", "worldobjs"),
                              data (new WorldObjsData::TeleporterData(*data_))
 {
   data->sprite.set_align_center_bottom ();
+  pos_ref = &data->pos;
 }
 
 CL_Vector&

Index: teleporter_target_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/teleporter_target_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- teleporter_target_obj.cxx   10 Sep 2002 12:11:29 -0000      1.1
+++ teleporter_target_obj.cxx   10 Sep 2002 14:33:07 -0000      1.2
@@ -24,10 +24,10 @@
 namespace EditorObjs {
 
 TeleporterTargetObj::TeleporterTargetObj (TeleporterObj* arg_teleporter)
-                                        : SpriteEditorObj ("teleporter2", 
-                                                          "worldobjs",
-                                                          
arg_teleporter->get_target_pos_ref()),
-                                          teleporter(arg_teleporter)
+  : SpriteEditorObj ("teleporter2", 
+                    "worldobjs",
+                    &arg_teleporter->get_target_pos_ref()),
+    teleporter(arg_teleporter)
 {
   sprite.set_align_center();
 }