[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.8,1.9 bumper_obj.hxx,1.7,1.8 conveyor_belt_obj.cxx,1.4,1.5 conveyor_belt_obj.hxx,1.4,1.5 entrance_obj.cxx,1.1,1.2 fake_exit_obj.cxx,1.9,1.10 fake_exit_obj.hxx,1.8,1.9 groundpiece_obj.cxx,1.2,1.3 guillotine_obj.cxx,1.8,1.9 guillotine_obj.hxx,1.7,1.8 hammer_obj.cxx,1.8,1.9 hammer_obj.hxx,1.7,1.8 ice_block_obj.cxx,1.4,1.5 ice_block_obj.hxx,1.3,1.4 info_box_obj.cxx,1.3,1.4 info_box_obj.hxx,1.4,1.5 laser_exit_obj.cxx,1.9,1.10 laser_exit_obj.hxx,1.7,1.8 liquid_obj.cxx,1.2,1.3 smasher_obj.cxx,1.7,1.8 smasher_obj.hxx,1.8,1.9 solid_color_background_obj.cxx,1.3,1.4 solid_color_background_obj.hxx,1.3,1.4 spike_obj.cxx,1.8,1.9 spike_obj.hxx,1.7,1.8 starfield_background_obj.cxx,1.2,1.3 starfield_background_obj.hxx,1.3,1.4 switch_door_obj.cxx,1.5,1.6 switch_door_obj.hxx,1.5,1.6 switch_door_switch_obj.cxx,1.1,1.2 teleporter_obj.cxx,1.6,1.7 teleporter_obj.hxx,1.7,1.8 teleporter_target_obj.cxx,1.4,1.5 thunderstorm_background_obj.cxx,1.2,1.3

[torangan]

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

Modified Files:
        bumper_obj.cxx bumper_obj.hxx conveyor_belt_obj.cxx 
        conveyor_belt_obj.hxx entrance_obj.cxx fake_exit_obj.cxx 
        fake_exit_obj.hxx groundpiece_obj.cxx guillotine_obj.cxx 
        guillotine_obj.hxx hammer_obj.cxx hammer_obj.hxx 
        ice_block_obj.cxx ice_block_obj.hxx info_box_obj.cxx 
        info_box_obj.hxx laser_exit_obj.cxx laser_exit_obj.hxx 
        liquid_obj.cxx smasher_obj.cxx smasher_obj.hxx 
        solid_color_background_obj.cxx solid_color_background_obj.hxx 
        spike_obj.cxx spike_obj.hxx starfield_background_obj.cxx 
        starfield_background_obj.hxx switch_door_obj.cxx 
        switch_door_obj.hxx switch_door_switch_obj.cxx 
        teleporter_obj.cxx teleporter_obj.hxx 
        teleporter_target_obj.cxx thunderstorm_background_obj.cxx 
Log Message:
replaced CL_Vector with a smaller Vector class


Index: bumper_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bumper_obj.cxx      27 Sep 2002 18:36:40 -0000      1.8
+++ bumper_obj.cxx      28 Sep 2002 11:52:24 -0000      1.9
@@ -41,7 +41,7 @@
 }
 
 EditorObjLst
-BumperObj::create (const CL_Vector& pos)
+BumperObj::create (const Vector& pos)
 {
   WorldObjsData::BumperData newdata;
   newdata.pos = pos;

Index: bumper_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bumper_obj.hxx      27 Sep 2002 18:36:40 -0000      1.7
+++ bumper_obj.hxx      28 Sep 2002 11:52:24 -0000      1.8
@@ -38,7 +38,7 @@
   BumperObj (const WorldObjsData::BumperData& data_);
  ~BumperObj ();   
 
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
   

Index: conveyor_belt_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/conveyor_belt_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- conveyor_belt_obj.cxx       27 Sep 2002 18:36:40 -0000      1.4
+++ conveyor_belt_obj.cxx       28 Sep 2002 11:52:24 -0000      1.5
@@ -75,7 +75,7 @@
 }
 
 EditorObjLst
-ConveyorBeltObj::create (const CL_Vector& pos)
+ConveyorBeltObj::create (const Vector& pos)
 {
   WorldObjsData::ConveyorBeltData newdata;
   newdata.pos = pos;
@@ -110,12 +110,12 @@
 }
 
 void 
-ConveyorBeltObj::set_position_offset (const CL_Vector& offset)
+ConveyorBeltObj::set_position_offset (const Vector& offset)
 {
   data->pos += offset;
 }
 
-CL_Vector
+Vector
 ConveyorBeltObj::get_upper_left_corner () {
   return data->pos;
 }

Index: conveyor_belt_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/conveyor_belt_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- conveyor_belt_obj.hxx       27 Sep 2002 18:36:40 -0000      1.4
+++ conveyor_belt_obj.hxx       28 Sep 2002 11:52:24 -0000      1.5
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_EDITOROBJS_CONVEYOR_BELT_OBJ_HXX
 #define HEADER_PINGUS_EDITOROBJS_CONVEYOR_BELT_OBJ_HXX
 
+#include <ClanLib/Display/Display/surface.h>
 #include "../editor/rect_editorobj.hxx"
 
 class WorldObjData;
@@ -52,14 +53,14 @@
 
   float get_z_pos ();
 
-  void set_position_offset (const CL_Vector &);
+  void set_position_offset (const Vector &);
   
   static EditorObjLst create (WorldObjData* obj);
 
   /** Create the object with reasonable defaults */
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
-  CL_Vector get_upper_left_corner ();
+  Vector get_upper_left_corner ();
 
   void write_xml (std::ostream& xml);
   std::string status_line ();

Index: entrance_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/entrance_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- entrance_obj.cxx    27 Sep 2002 11:26:46 -0000      1.1
+++ entrance_obj.cxx    28 Sep 2002 11:52:24 -0000      1.2
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
+#include <iostream>
 #include "../pingus_error.hxx"
 #include "../editor/entrance_window.hxx"
 #include "entrance_obj.hxx"

Index: fake_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fake_exit_obj.cxx   27 Sep 2002 18:36:40 -0000      1.9
+++ fake_exit_obj.cxx   28 Sep 2002 11:52:24 -0000      1.10
@@ -41,7 +41,7 @@
 }
 
 EditorObjLst
-FakeExitObj::create (const CL_Vector& pos)
+FakeExitObj::create (const Vector& pos)
 {
   WorldObjsData::FakeExitData newdata;
   newdata.pos = pos;

Index: fake_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fake_exit_obj.hxx   27 Sep 2002 18:36:40 -0000      1.8
+++ fake_exit_obj.hxx   28 Sep 2002 11:52:24 -0000      1.9
@@ -38,7 +38,7 @@
   FakeExitObj (const WorldObjsData::FakeExitData& data_);
   ~FakeExitObj ();
    
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
     

Index: groundpiece_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/groundpiece_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- groundpiece_obj.cxx 27 Sep 2002 18:36:40 -0000      1.2
+++ groundpiece_obj.cxx 28 Sep 2002 11:52:24 -0000      1.3
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
+#include <iostream>
 #include "../editor/groundpiece_window.hxx"
 #include "../worldobjsdata/groundpiece_data.hxx"
 #include "../pingus_resource.hxx"

Index: guillotine_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- guillotine_obj.cxx  27 Sep 2002 18:36:40 -0000      1.8
+++ guillotine_obj.cxx  28 Sep 2002 11:52:24 -0000      1.9
@@ -39,7 +39,7 @@
 }
 
 EditorObjLst
-GuillotineObj::create (const CL_Vector& pos)
+GuillotineObj::create (const Vector& pos)
 {
   WorldObjsData::GuillotineData newdata;
   newdata.pos = pos;

Index: guillotine_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- guillotine_obj.hxx  27 Sep 2002 18:36:40 -0000      1.7
+++ guillotine_obj.hxx  28 Sep 2002 11:52:24 -0000      1.8
@@ -38,7 +38,7 @@
   GuillotineObj (const WorldObjsData::GuillotineData& data_);
   ~GuillotineObj ();
    
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
     

Index: hammer_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hammer_obj.cxx      27 Sep 2002 18:36:40 -0000      1.8
+++ hammer_obj.cxx      28 Sep 2002 11:52:24 -0000      1.9
@@ -46,7 +46,7 @@
 }
 
 EditorObjLst
-HammerObj::create (const CL_Vector& pos)
+HammerObj::create (const Vector& pos)
 {
   WorldObjsData::HammerData hammer_data;
   hammer_data.pos = pos;

Index: hammer_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hammer_obj.hxx      27 Sep 2002 18:36:40 -0000      1.7
+++ hammer_obj.hxx      28 Sep 2002 11:52:24 -0000      1.8
@@ -38,7 +38,7 @@
   HammerObj (const WorldObjsData::HammerData& data_);
   ~HammerObj ();
    
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
     

Index: ice_block_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/ice_block_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ice_block_obj.cxx   27 Sep 2002 18:36:40 -0000      1.4
+++ ice_block_obj.cxx   28 Sep 2002 11:52:24 -0000      1.5
@@ -37,7 +37,7 @@
 
 /** Create the object with resonable defaults */
 EditorObjLst
-IceBlockObj::create (const CL_Vector& pos)
+IceBlockObj::create (const Vector& pos)
 {
   WorldObjsData::IceBlockData newdata;
   newdata.pos = pos;

Index: ice_block_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/ice_block_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ice_block_obj.hxx   27 Sep 2002 18:36:40 -0000      1.3
+++ ice_block_obj.hxx   28 Sep 2002 11:52:25 -0000      1.4
@@ -38,7 +38,7 @@
  ~IceBlockObj ();
 
   /** Create the object with resonable defaults */
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
   void write_xml (std::ostream& xml);
   

Index: info_box_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/info_box_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- info_box_obj.cxx    27 Sep 2002 18:36:40 -0000      1.3
+++ info_box_obj.cxx    28 Sep 2002 11:52:25 -0000      1.4
@@ -35,7 +35,7 @@
 }
 
 EditorObjLst
-InfoBoxObj::create (const CL_Vector& pos)
+InfoBoxObj::create (const Vector& pos)
 {
   WorldObjsData::InfoBoxData newdata;
   newdata.pos = pos;

Index: info_box_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/info_box_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- info_box_obj.hxx    27 Sep 2002 18:36:40 -0000      1.4
+++ info_box_obj.hxx    28 Sep 2002 11:52:25 -0000      1.5
@@ -37,7 +37,7 @@
   InfoBoxObj (const WorldObjsData::InfoBoxData& data_);
  ~InfoBoxObj ();
 
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
   void write_xml (std::ostream& xml);
   EditorObj* duplicate ();

Index: laser_exit_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- laser_exit_obj.cxx  27 Sep 2002 18:36:40 -0000      1.9
+++ laser_exit_obj.cxx  28 Sep 2002 11:52:25 -0000      1.10
@@ -40,7 +40,7 @@
 }
 
 EditorObjLst
-LaserExitObj::create (const CL_Vector& pos)
+LaserExitObj::create (const Vector& pos)
 {
   WorldObjsData::LaserExitData newdata;
   newdata.pos = pos;

Index: laser_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- laser_exit_obj.hxx  27 Sep 2002 18:36:40 -0000      1.7
+++ laser_exit_obj.hxx  28 Sep 2002 11:52:25 -0000      1.8
@@ -38,7 +38,7 @@
   LaserExitObj (const WorldObjsData::LaserExitData& data_);
   ~LaserExitObj ();
 
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
    
   EditorObj* duplicate ();

Index: liquid_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/liquid_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- liquid_obj.cxx      27 Sep 2002 18:36:40 -0000      1.2
+++ liquid_obj.cxx      28 Sep 2002 11:52:25 -0000      1.3
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "../worldobjsdata/liquid_data.hxx"
 #include "../editor/editor_view.hxx"
 #include "liquid_obj.hxx"
 
@@ -51,7 +50,7 @@
 LiquidObj::draw (EditorNS::EditorView* view)
 {
   for (int i = 0; i < data->width; ++i)
-    view->draw(sprite, data->pos + CL_Vector(i * sprite.get_width(), 0));
+    view->draw(sprite, data->pos + Vector(i * sprite.get_width(), 0));
 }
 
 void

Index: smasher_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- smasher_obj.cxx     27 Sep 2002 18:36:40 -0000      1.7
+++ smasher_obj.cxx     28 Sep 2002 11:52:25 -0000      1.8
@@ -39,7 +39,7 @@
 }
 
 EditorObjLst
-SmasherObj::create (const CL_Vector& pos)
+SmasherObj::create (const Vector& pos)
 {
   WorldObjsData::SmasherData smasher_data;
   smasher_data.pos = pos;

Index: smasher_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smasher_obj.hxx     27 Sep 2002 18:36:40 -0000      1.8
+++ smasher_obj.hxx     28 Sep 2002 11:52:25 -0000      1.9
@@ -38,7 +38,7 @@
   SmasherObj (const WorldObjsData::SmasherData& data_);
   ~SmasherObj ();
 
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
    
   EditorObj* duplicate ();
     

Index: solid_color_background_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/solid_color_background_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- solid_color_background_obj.cxx      27 Sep 2002 18:36:40 -0000      1.3
+++ solid_color_background_obj.cxx      28 Sep 2002 11:52:25 -0000      1.4
@@ -52,7 +52,7 @@
   return data->pos.z;
 }
 
-CL_Vector
+Vector
 SolidColorBackgroundObj::get_upper_left_corner ()
 { 
   return data->pos; 
@@ -72,7 +72,7 @@
 }
 
 void
-SolidColorBackgroundObj::set_position_offset (const CL_Vector& offset)
+SolidColorBackgroundObj::set_position_offset (const Vector& offset)
 {
   data->pos += offset;
 }  

Index: solid_color_background_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/solid_color_background_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- solid_color_background_obj.hxx      27 Sep 2002 18:36:40 -0000      1.3
+++ solid_color_background_obj.hxx      28 Sep 2002 11:52:25 -0000      1.4
@@ -49,11 +49,11 @@
 
   float get_z_pos ();
 
-  CL_Vector get_upper_left_corner ();
+  Vector get_upper_left_corner ();
 
   void draw (EditorNS::EditorView* view);
   
-  void set_position_offset (const CL_Vector& offset);  
+  void set_position_offset (const Vector& offset);  
 
   std::string status_line ();
         

Index: spike_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- spike_obj.cxx       27 Sep 2002 18:36:40 -0000      1.8
+++ spike_obj.cxx       28 Sep 2002 11:52:25 -0000      1.9
@@ -39,7 +39,7 @@
 }
 
 EditorObjLst
-SpikeObj::create (const CL_Vector& pos)
+SpikeObj::create (const Vector& pos)
 {
   WorldObjsData::SpikeData spike_data;
   spike_data.pos = pos;

Index: spike_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- spike_obj.hxx       27 Sep 2002 18:36:40 -0000      1.7
+++ spike_obj.hxx       28 Sep 2002 11:52:25 -0000      1.8
@@ -38,7 +38,7 @@
   SpikeObj (const WorldObjsData::SpikeData& data_);
   ~SpikeObj ();
    
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
     

Index: starfield_background_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/starfield_background_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- starfield_background_obj.cxx        27 Sep 2002 18:36:40 -0000      1.2
+++ starfield_background_obj.cxx        28 Sep 2002 11:52:25 -0000      1.3
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "../string_converter.hxx"
 #include "starfield_background_obj.hxx"
 #include "../worldobjsdata/starfield_background_data.hxx"
 

Index: starfield_background_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/starfield_background_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- starfield_background_obj.hxx        27 Sep 2002 18:36:40 -0000      1.3
+++ starfield_background_obj.hxx        28 Sep 2002 11:52:25 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_EDITOROBJS_STARFIELD_BACKGROUND_OBJ_HXX
 #define HEADER_PINGUS_EDITOROBJS_STARFIELD_BACKGROUND_OBJ_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../string_converter.hxx"
 #include "../editor/sprite_editorobj.hxx"
 
@@ -34,7 +34,7 @@
 {
 private:
   WorldObjsData::StarfieldBackgroundData* const data;
-  CL_Vector pos;
+  Vector pos;
   
 public:
   StarfieldBackgroundObj (const WorldObjsData::StarfieldBackgroundData& data_);

Index: switch_door_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/switch_door_obj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- switch_door_obj.cxx 27 Sep 2002 18:36:40 -0000      1.5
+++ switch_door_obj.cxx 28 Sep 2002 11:52:25 -0000      1.6
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <fstream>
+#include <iostream>
 #include "switch_door_obj.hxx"
 #include "../editor/editor_view.hxx"
 #include "../pingus_resource.hxx"
@@ -67,7 +67,7 @@
 /** Create this object (and child objects) with resonable defaults
     for the editor */
 EditorObjLst
-SwitchDoorObj::create (const CL_Vector& pos)
+SwitchDoorObj::create (const Vector& pos)
 {
   WorldObjsData::SwitchDoorData newdata;
 
@@ -131,14 +131,14 @@
   data->write_xml(xml);
 }
 
-CL_Vector
+Vector
 SwitchDoorObj::get_upper_left_corner ()
 {
   return data->door_pos;
 }
 
 void 
-SwitchDoorObj::set_position_offset (const CL_Vector& offset)
+SwitchDoorObj::set_position_offset (const Vector& offset)
 {
   data->door_pos += offset;
 }

Index: switch_door_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/switch_door_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- switch_door_obj.hxx 27 Sep 2002 18:36:40 -0000      1.5
+++ switch_door_obj.hxx 28 Sep 2002 11:52:25 -0000      1.6
@@ -46,7 +46,7 @@
   
   /** Create this object (and child objects) with reasonable defaults
       for the editor */
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate();
   float get_z_pos ();
@@ -57,9 +57,9 @@
   void make_larger ();
   void make_smaller ();
   void write_xml (std::ostream& xml);
-  CL_Vector get_upper_left_corner ();
+  Vector get_upper_left_corner ();
 
-  void set_position_offset(const CL_Vector &);
+  void set_position_offset(const Vector &);
 
   void draw (EditorNS::EditorView* view);
   void save_xml (std::ostream& xml);

Index: switch_door_switch_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/switch_door_switch_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- switch_door_switch_obj.cxx  11 Sep 2002 15:27:19 -0000      1.1
+++ switch_door_switch_obj.cxx  28 Sep 2002 11:52:25 -0000      1.2
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
 #include "switch_door_obj.hxx"
 #include "../worldobjsdata/switch_door_data.hxx"
 

Index: teleporter_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/teleporter_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- teleporter_obj.cxx  27 Sep 2002 18:36:40 -0000      1.6
+++ teleporter_obj.cxx  28 Sep 2002 11:52:25 -0000      1.7
@@ -17,8 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
 #include <stdio.h>
+#include <iostream>
 #include "teleporter_obj.hxx"
 #include "../editor/editor_view.hxx"
 #include "../worldobjsdata/teleporter_data.hxx"
@@ -38,7 +38,7 @@
   delete data;
 }
 
-CL_Vector&
+Vector&
 TeleporterObj::get_target_pos_ref ()
 {
   return data->target_pos;
@@ -52,7 +52,7 @@
 }
 
 EditorObjLst
-TeleporterObj::create (const CL_Vector& pos)
+TeleporterObj::create (const Vector& pos)
 {
   WorldObjsData::TeleporterData newdata;
 

Index: teleporter_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/teleporter_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- teleporter_obj.hxx  27 Sep 2002 18:36:40 -0000      1.7
+++ teleporter_obj.hxx  28 Sep 2002 11:52:25 -0000      1.8
@@ -44,7 +44,7 @@
   TeleporterObj (const WorldObjsData::TeleporterData& data_);
  ~TeleporterObj ();
 
-  CL_Vector& get_target_pos_ref ();
+  Vector& get_target_pos_ref ();
 
   EditorObj* duplicate ();
 
@@ -52,7 +52,7 @@
 
   /** Create this object (and child objects) with reasonable defaults
       for the editor */
-  static EditorObjLst create (const CL_Vector& pos);
+  static EditorObjLst create (const Vector& pos);
 
   void draw (EditorNS::EditorView * view);
   std::string status_line ();

Index: teleporter_target_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/teleporter_target_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- teleporter_target_obj.cxx   16 Sep 2002 23:49:56 -0000      1.4
+++ teleporter_target_obj.cxx   28 Sep 2002 11:52:25 -0000      1.5
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "teleporter_obj.hxx"
 #include "teleporter_target_obj.hxx"
 
@@ -42,7 +42,7 @@
 std::string
 TeleporterTargetObj::status_line()
 {
-  const CL_Vector& pos_ref = teleporter->get_target_pos_ref();
+  const Vector& pos_ref = teleporter->get_target_pos_ref();
   char str[128];
   snprintf(str, 128, "TeleporterTarget - %f %f %f", pos_ref.x, pos_ref.y, 
pos_ref.z);
   return str;

Index: thunderstorm_background_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/thunderstorm_background_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- thunderstorm_background_obj.cxx     27 Sep 2002 18:36:40 -0000      1.2
+++ thunderstorm_background_obj.cxx     28 Sep 2002 11:52:25 -0000      1.3
@@ -26,7 +26,7 @@
   : SpriteEditorObj ("Stars/starfield_icon", "game"),
     data(new WorldObjsData::ThunderstormBackgroundData(data_))
 {
-  data->pos = CL_Vector(-128.0f, 0.0f);
+  data->pos = Vector(-128.0f, 0.0f);
   pos_ref = &data->pos;
 }