[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.hxx,1.3,1.4 conveyor_belt_data.cxx,1.5,1.6 conveyor_belt_data.hxx,1.3,1.4 entrance_data.cxx,1.1,1.2 entrance_data.hxx,1.1,1.2 exit_data.hxx,1.1,1.2 fake_exit_data.hxx,1.3,1.4 groundpiece_data.cxx,1.5,1.6 groundpiece_data.hxx,1.2,1.3 guillotine_data.hxx,1.3,1.4 hammer_data.hxx,1.3,1.4 hotspot_data.hxx,1.2,1.3 ice_block_data.cxx,1.5,1.6 ice_block_data.hxx,1.3,1.4 info_box_data.cxx,1.7,1.8 info_box_data.hxx,1.3,1.4 laser_exit_data.hxx,1.3,1.4 liquid_data.hxx,1.2,1.3 prefab_obj_data.cxx,1.3,1.4 prefab_obj_data.hxx,1.3,1.4 smasher_data.hxx,1.3,1.4 snow_generator_data.cxx,1.3,1.4 snow_generator_data.hxx,1.3,1.4 solid_color_background_data.hxx,1.2,1.3 spike_data.hxx,1.3,1.4 starfield_background_data.cxx,1.3,1.4 surface_background_data.cxx,1.3,1.4 surface_background_data.hxx,1.2,1.3 switch_door_data.cxx,1.6,1.7 switch_door_data.hxx,1.3,1.4 teleporter_data.hxx,1.2,1.3 thunderstorm_background_data.hxx,1.2,1.3 worldobj_group_data.cxx,1.5,1.6

[torangan]

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

Modified Files:
        bumper_data.hxx conveyor_belt_data.cxx conveyor_belt_data.hxx 
        entrance_data.cxx entrance_data.hxx exit_data.hxx 
        fake_exit_data.hxx groundpiece_data.cxx groundpiece_data.hxx 
        guillotine_data.hxx hammer_data.hxx hotspot_data.hxx 
        ice_block_data.cxx ice_block_data.hxx info_box_data.cxx 
        info_box_data.hxx laser_exit_data.hxx liquid_data.hxx 
        prefab_obj_data.cxx prefab_obj_data.hxx smasher_data.hxx 
        snow_generator_data.cxx snow_generator_data.hxx 
        solid_color_background_data.hxx spike_data.hxx 
        starfield_background_data.cxx surface_background_data.cxx 
        surface_background_data.hxx switch_door_data.cxx 
        switch_door_data.hxx teleporter_data.hxx 
        thunderstorm_background_data.hxx worldobj_group_data.cxx 
Log Message:
replaced CL_Vector with a smaller Vector class


Index: bumper_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bumper_data.hxx     27 Sep 2002 11:26:49 -0000      1.3
+++ bumper_data.hxx     28 Sep 2002 11:52:26 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_BUMPER_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_BUMPER_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include <ClanLib/Display/Display/surface.h>
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
@@ -30,7 +30,7 @@
 class BumperData : public WorldObjData {
 public:
   CL_Surface surface;
-  CL_Vector  pos;
+  Vector  pos;
       
 public:
   BumperData ();

Index: conveyor_belt_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- conveyor_belt_data.cxx      27 Sep 2002 18:36:41 -0000      1.5
+++ conveyor_belt_data.cxx      28 Sep 2002 11:52:26 -0000      1.6
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include "../pingus_resource.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/conveyor_belt_obj.hxx"
 #include "../worldobjs/conveyor_belt.hxx"

Index: conveyor_belt_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- conveyor_belt_data.hxx      27 Sep 2002 11:26:49 -0000      1.3
+++ conveyor_belt_data.hxx      28 Sep 2002 11:52:26 -0000      1.4
@@ -20,8 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_CONVEYOR_BELT_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_CONVEYOR_BELT_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
-#include <ClanLib/Display/Display/surface.h>
+#include "../vector.hxx"
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
@@ -30,7 +29,7 @@
 class ConveyorBeltData : public WorldObjData
 {
 public:
-  CL_Vector pos;
+  Vector pos;
   int    width;
   double speed;
   float  counter;

Index: entrance_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/entrance_data.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- entrance_data.cxx   27 Sep 2002 11:26:49 -0000      1.1
+++ entrance_data.cxx   28 Sep 2002 11:52:26 -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 <iostream>
 #include "../editorobjs/entrance_obj.hxx"
 #include "../worldobjs/entrances/woodthing.hxx"
 #include "../worldobjs/entrances/cloud.hxx"

Index: entrance_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/entrance_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- entrance_data.hxx   27 Sep 2002 11:26:49 -0000      1.1
+++ entrance_data.hxx   28 Sep 2002 11:52:26 -0000      1.2
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_ENTRANCE_DATA_HXX
 #define HEADER_PINGUS_ENTRANCE_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../libxmlfwd.hxx"
 #include "../res_descriptor.hxx"
 #include "../worldobj_data.hxx"
@@ -35,7 +35,7 @@
 public:
   EntranceDirection direction;
   ResDescriptor     desc;
-  CL_Vector         pos;
+  Vector         pos;
   int               release_rate;
   int               owner_id;
   

Index: exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/exit_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exit_data.hxx       27 Sep 2002 16:01:55 -0000      1.1
+++ exit_data.hxx       28 Sep 2002 11:52:26 -0000      1.2
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_EXIT_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_EXIT_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../libxmlfwd.hxx"
 #include "../res_descriptor.hxx"
 #include "../worldobj_data.hxx"
@@ -30,7 +30,7 @@
 class ExitData : public WorldObjData
 {
 public:
-  CL_Vector pos;
+  Vector pos;
   ResDescriptor desc;
   int owner_id;
   

Index: fake_exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/fake_exit_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fake_exit_data.hxx  27 Sep 2002 11:26:49 -0000      1.3
+++ fake_exit_data.hxx  28 Sep 2002 11:52:26 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_FAKE_EXIT_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_FAKE_EXIT_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include <ClanLib/Display/Display/surface.h>
 #include "../game_counter.hxx"
 #include "../libxmlfwd.hxx"
@@ -31,7 +31,7 @@
 class FakeExitData : public WorldObjData {
 public:
   CL_Surface  surface;
-  CL_Vector   pos;
+  Vector   pos;
   GameCounter counter;
       
 public:

Index: groundpiece_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- groundpiece_data.cxx        27 Sep 2002 18:36:41 -0000      1.5
+++ groundpiece_data.cxx        28 Sep 2002 11:52:26 -0000      1.6
@@ -17,10 +17,9 @@
 //  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 <iostream>
 #include "../editorobjs/groundpiece_obj.hxx"
 #include "../worldobjs/groundpiece.hxx"
-#include "../world.hxx"
 #include "../xml_helper.hxx"
 #include "groundpiece_data.hxx"
 

Index: groundpiece_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- groundpiece_data.hxx        27 Sep 2002 11:26:49 -0000      1.2
+++ groundpiece_data.hxx        28 Sep 2002 11:52:26 -0000      1.3
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_GROUNDPIECE_DATA_HXX
 #define HEADER_PINGUS_GROUNDPIECE_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include <ClanLib/Display/Display/surface.h>
 #include "../libxmlfwd.hxx"
 #include "../res_descriptor.hxx"
@@ -34,7 +34,7 @@
 public:
   CL_Surface surface;
   ResDescriptor desc;
-  CL_Vector pos;
+  Vector pos;
 
   Groundtype::GPType gptype; 
 

Index: guillotine_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/guillotine_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- guillotine_data.hxx 27 Sep 2002 11:26:49 -0000      1.3
+++ guillotine_data.hxx 28 Sep 2002 11:52:26 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_GUILLOTINE_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_GUILLOTINE_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include <ClanLib/Display/Display/surface.h>
 #include "../direction.hxx"
 #include "../game_counter.hxx"
@@ -33,7 +33,7 @@
 public:
   CL_Surface  surface;
   CL_Surface  idle_surf;
-  CL_Vector   pos;
+  Vector   pos;
   Direction   direction;
   GameCounter counter;
   GameCounter idle_counter;

Index: hammer_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hammer_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hammer_data.hxx     27 Sep 2002 11:26:49 -0000      1.3
+++ hammer_data.hxx     28 Sep 2002 11:52:26 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_HAMMER_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_HAMMER_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include <ClanLib/Display/Display/surface.h>
 #include "../game_counter.hxx"
 #include "../libxmlfwd.hxx"
@@ -31,7 +31,7 @@
 class HammerData : public WorldObjData {
 public:
   CL_Surface  surface;
-  CL_Vector   pos;
+  Vector   pos;
   GameCounter counter;
       
 public:

Index: hotspot_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hotspot_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hotspot_data.hxx    27 Sep 2002 11:26:49 -0000      1.2
+++ hotspot_data.hxx    28 Sep 2002 11:52:26 -0000      1.3
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_HOTSPOT_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_HOTSPOT_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../libxmlfwd.hxx"
 #include "../res_descriptor.hxx"
 #include "../worldobj_data.hxx"
@@ -33,7 +33,7 @@
   int           speed;
   float         para;
   ResDescriptor desc;
-  CL_Vector     pos;
+  Vector     pos;
 
   HotspotData ();
   

Index: ice_block_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ice_block_data.cxx  27 Sep 2002 18:36:41 -0000      1.5
+++ ice_block_data.cxx  28 Sep 2002 11:52:26 -0000      1.6
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include "../pingus_resource.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/ice_block_obj.hxx"
 #include "../worldobjs/ice_block.hxx"

Index: ice_block_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ice_block_data.hxx  27 Sep 2002 11:26:49 -0000      1.3
+++ ice_block_data.hxx  28 Sep 2002 11:52:27 -0000      1.4
@@ -20,8 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_ICE_BLOCK_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_ICE_BLOCK_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
-#include <ClanLib/Display/Display/surface.h>
+#include "../vector.hxx"
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
@@ -31,7 +30,7 @@
 {
 public:
   /// The upper/left position  of the iceblock's
-  CL_Vector pos;
+  Vector pos;
 
   /** The number of iceblocks, only complete blocks are supported */  
   int width;

Index: info_box_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/info_box_data.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- info_box_data.cxx   27 Sep 2002 18:36:41 -0000      1.7
+++ info_box_data.cxx   28 Sep 2002 11:52:27 -0000      1.8
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include "../pingus_resource.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/info_box_obj.hxx"
 #include "../worldobjs/info_box.hxx"

Index: info_box_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/info_box_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- info_box_data.hxx   27 Sep 2002 11:26:49 -0000      1.3
+++ info_box_data.hxx   28 Sep 2002 11:52:27 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_INFO_BOX_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_INFO_BOX_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../sprite.hxx"
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
@@ -33,8 +33,8 @@
 {
 public:
   std::string info_text;
-  CL_Vector pos;
-  CL_Vector text_pos;
+  Vector pos;
+  Vector text_pos;
   Sprite    sprite;
 
 public:

Index: laser_exit_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/laser_exit_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- laser_exit_data.hxx 27 Sep 2002 11:26:49 -0000      1.3
+++ laser_exit_data.hxx 28 Sep 2002 11:52:27 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_LASER_EXIT_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_LASER_EXIT_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include <ClanLib/Display/Display/surface.h>
 #include "../game_counter.hxx"
 #include "../libxmlfwd.hxx"
@@ -31,7 +31,7 @@
 class LaserExitData : public WorldObjData {
 public:
   CL_Surface  surface;
-  CL_Vector   pos;
+  Vector   pos;
   GameCounter counter;
       
 public:

Index: liquid_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/liquid_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- liquid_data.hxx     27 Sep 2002 11:26:49 -0000      1.2
+++ liquid_data.hxx     28 Sep 2002 11:52:27 -0000      1.3
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_LIQUID_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_LIQUID_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../libxmlfwd.hxx"
 #include "../res_descriptor.hxx"
 #include "../worldobj_data.hxx"
@@ -31,7 +31,7 @@
 {
 public:
   ResDescriptor desc;
-  CL_Vector pos;
+  Vector pos;
 
   /** Cause to interpret the width in pixels instead of tiles */
   bool old_width_handling;

Index: prefab_obj_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- prefab_obj_data.cxx 15 Sep 2002 20:33:45 -0000      1.3
+++ prefab_obj_data.cxx 28 Sep 2002 11:52:27 -0000      1.4
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <iostream>
 #include "../xml_helper.hxx"
 #include "../prefab.hxx"
 #include "prefab_obj_data.hxx"

Index: prefab_obj_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- prefab_obj_data.hxx 27 Sep 2002 11:26:49 -0000      1.3
+++ prefab_obj_data.hxx 28 Sep 2002 11:52:27 -0000      1.4
@@ -20,7 +20,8 @@
 #ifndef HEADER_PREFAB_DATA_HXX
 #define HEADER_PREFAB_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include <string>
+#include "../vector.hxx"
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
@@ -42,7 +43,7 @@
 {
 public:
   /** The position of the prefab */
-  CL_Vector pos;
+  Vector pos;
 
   /** The uniq identifer of this prefab */
   std::string uid;

Index: smasher_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/smasher_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smasher_data.hxx    27 Sep 2002 11:26:49 -0000      1.3
+++ smasher_data.hxx    28 Sep 2002 11:52:27 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_SMASHER_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_SMASHER_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include <ClanLib/Display/Display/surface.h>
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
@@ -30,7 +30,7 @@
 class SmasherData : public WorldObjData {
 public:
   CL_Surface  surface;
-  CL_Vector   pos;
+  Vector   pos;
       
 public:
   SmasherData ();

Index: snow_generator_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/snow_generator_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- snow_generator_data.cxx     16 Sep 2002 17:17:17 -0000      1.3
+++ snow_generator_data.cxx     28 Sep 2002 11:52:27 -0000      1.4
@@ -17,7 +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 <iostream>
+#include "../editor/weather_obj.hxx"
 #include "../worldobjs/snow_generator.hxx"
 #include "snow_generator_data.hxx"
 

Index: snow_generator_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/snow_generator_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- snow_generator_data.hxx     27 Sep 2002 11:26:49 -0000      1.3
+++ snow_generator_data.hxx     28 Sep 2002 11:52:27 -0000      1.4
@@ -20,7 +20,6 @@
 #ifndef HEADER_PINGUS_SNOW_GENERATOR_DATA_HXX
 #define HEADER_PINGUS_SNOW_GENERATOR_DATA_HXX
 
-#include "../editor/weather_obj.hxx"
 #include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 

Index: solid_color_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/solid_color_background_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- solid_color_background_data.hxx     27 Sep 2002 11:26:49 -0000      1.2
+++ solid_color_background_data.hxx     28 Sep 2002 11:52:27 -0000      1.3
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_SOLID_COLOR_BACKGROUND_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_SOLID_COLOR_BACKGROUND_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../color.hxx"
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
@@ -30,7 +30,7 @@
 class SolidColorBackgroundData : public WorldObjData
 {
 public:
-  CL_Vector pos;
+  Vector pos;
   Color     color;
 
   // FIXME: Add z_pos handling here

Index: spike_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/spike_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- spike_data.hxx      27 Sep 2002 11:26:49 -0000      1.3
+++ spike_data.hxx      28 Sep 2002 11:52:27 -0000      1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_SPIKE_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_SPIKE_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include <ClanLib/Display/Display/surface.h>
 #include "../game_counter.hxx"
 #include "../libxmlfwd.hxx"
@@ -31,7 +31,7 @@
 class SpikeData : public WorldObjData {
 public:
   CL_Surface  surface;
-  CL_Vector   pos;
+  Vector   pos;
   GameCounter counter;
       
 public:

Index: starfield_background_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/starfield_background_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- starfield_background_data.cxx       27 Sep 2002 18:36:41 -0000      1.3
+++ starfield_background_data.cxx       28 Sep 2002 11:52:27 -0000      1.4
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include "../string_converter.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/starfield_background_obj.hxx"
 #include "../worldobjs/starfield_background.hxx"

Index: surface_background_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/surface_background_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- surface_background_data.cxx 27 Sep 2002 18:36:41 -0000      1.3
+++ surface_background_data.cxx 28 Sep 2002 11:52:27 -0000      1.4
@@ -27,7 +27,7 @@
 
 SurfaceBackgroundData::SurfaceBackgroundData () : para_x(0.5),
                                                  para_y(0.5),
-                                                 pos(CL_Vector(0, 0, -150)),
+                                                 pos(Vector(0, 0, -150)),
                                                  scroll_x(0.0),
                                                   scroll_y(0.0),
                                                  color(Color(0,0,0,0)),

Index: surface_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/surface_background_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- surface_background_data.hxx 27 Sep 2002 11:26:49 -0000      1.2
+++ surface_background_data.hxx 28 Sep 2002 11:52:27 -0000      1.3
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_SURFACE_BACKGROUND_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_SURFACE_BACKGROUND_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../worldobj_data.hxx"
 #include "../color.hxx"
 #include "../res_descriptor.hxx"
@@ -36,7 +36,7 @@
   float para_y;
 
   /** Position of the background, only the z_pos is really used. */
-  CL_Vector pos;
+  Vector pos;
 
   /** The amount of pixel the background is scrolled each frame in x
       direction. */

Index: switch_door_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- switch_door_data.cxx        27 Sep 2002 18:36:41 -0000      1.6
+++ switch_door_data.cxx        28 Sep 2002 11:52:27 -0000      1.7
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include "../pingus_resource.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/switch_door_obj.hxx"
 #include "../worldobjs/switch_door.hxx"

Index: switch_door_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- switch_door_data.hxx        27 Sep 2002 11:26:49 -0000      1.3
+++ switch_door_data.hxx        28 Sep 2002 11:52:27 -0000      1.4
@@ -20,8 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_SWITCH_DOOR_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_SWITCH_DOOR_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
-#include <ClanLib/Display/Display/surface.h>
+#include "../vector.hxx"
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
 
@@ -33,10 +32,10 @@
 {
 public:
   /// The upper/middle pos of the door 
-  CL_Vector door_pos;
+  Vector door_pos;
   
   /// The bottom/middle pos of the switch
-  CL_Vector switch_pos;
+  Vector switch_pos;
 
   // The height of the door in graphic tiles
   int door_height;

Index: teleporter_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/teleporter_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- teleporter_data.hxx 27 Sep 2002 11:26:49 -0000      1.2
+++ teleporter_data.hxx 28 Sep 2002 11:52:27 -0000      1.3
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_TELEPORTER_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_TELEPORTER_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../sprite.hxx"
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
@@ -30,8 +30,8 @@
 class TeleporterData : public WorldObjData
 {
 public:
-  CL_Vector pos;
-  CL_Vector target_pos;
+  Vector pos;
+  Vector target_pos;
   
   Sprite sprite;
   Sprite target_sprite;

Index: thunderstorm_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- thunderstorm_background_data.hxx    27 Sep 2002 11:26:49 -0000      1.2
+++ thunderstorm_background_data.hxx    28 Sep 2002 11:52:27 -0000      1.3
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJSDATA_THUNDERSTORM_BACKGROUND_DATA_HXX
 #define HEADER_PINGUS_WORLDOBJSDATA_THUNDERSTORM_BACKGROUND_DATA_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include "../worldobj_data.hxx"
 #include "../libxmlfwd.hxx"
 
@@ -29,7 +29,7 @@
 class ThunderstormBackgroundData : public WorldObjData
 {
 public:
-  CL_Vector pos;
+  Vector pos;
 
 public:
   ThunderstormBackgroundData () {}

Index: worldobj_group_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- worldobj_group_data.cxx     27 Sep 2002 18:36:42 -0000      1.5
+++ worldobj_group_data.cxx     28 Sep 2002 11:52:27 -0000      1.6
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <fstream>
 #include "../editor/editorobj_group.hxx"
 #include "../xml_helper.hxx"
 #include "../worldobj_data_factory.hxx"