[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.7,1.8 conveyor_belt.cxx,1.17,1.18 conveyor_belt.hxx,1.14,1.15 entrance.cxx,1.1,1.2 exit.cxx,1.1,1.2 fake_exit.cxx,1.6,1.7 groundpiece.hxx,1.5,1.6 hotspot.cxx,1.3,1.4 ice_block.cxx,1.17,1.18 ice_block.hxx,1.13,1.14 info_box.cxx,1.15,1.16 rain_generator.cxx,1.3,1.4 smasher.cxx,1.9,1.10 starfield_background.hxx,1.4,1.5 starfield_background_stars.cxx,1.2,1.3 surface_background.cxx,1.2,1.3 surface_background.hxx,1.3,1.4 switch_door.cxx,1.19,1.20 switch_door.hxx,1.16,1.17 teleporter.cxx,1.11,1.12 thunderstorm_background.hxx,1.3,1.4

[torangan]

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

Modified Files:
        bumper.cxx conveyor_belt.cxx conveyor_belt.hxx entrance.cxx 
        exit.cxx fake_exit.cxx groundpiece.hxx hotspot.cxx 
        ice_block.cxx ice_block.hxx info_box.cxx rain_generator.cxx 
        smasher.cxx starfield_background.hxx 
        starfield_background_stars.cxx surface_background.cxx 
        surface_background.hxx switch_door.cxx switch_door.hxx 
        teleporter.cxx thunderstorm_background.hxx 
Log Message:
replaced CL_Vector with a smaller Vector class


Index: bumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/bumper.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bumper.cxx  27 Sep 2002 18:36:40 -0000      1.7
+++ bumper.cxx  28 Sep 2002 11:52:26 -0000      1.8
@@ -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 <ClanLib/Display/Display/surfaceprovider.h>
 #include "../col_map.hxx"
 #include "../graphic_context.hxx"
@@ -100,7 +101,7 @@
           && pingu->get_x() > data->pos.x + 0
          && pingu->get_x() < data->pos.x + 60)
        {
-         pingu->apply_force(CL_Vector((pingu->get_x() - 30)/6, -5));
+         pingu->apply_force(Vector((pingu->get_x() - 30)/6, -5));
        }
     }
 }

Index: conveyor_belt.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- conveyor_belt.cxx   27 Sep 2002 18:36:40 -0000      1.17
+++ conveyor_belt.cxx   28 Sep 2002 11:52:26 -0000      1.18
@@ -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 "../col_map.hxx"
 #include "../graphic_context.hxx"
 #include "../pingu.hxx"
@@ -82,7 +81,7 @@
          && (*pingu)->get_y() > data->pos.y - 2
          && (*pingu)->get_y() < data->pos.y + 10)
        {
-         CL_Vector pos = (*pingu)->get_pos();
+         Vector pos = (*pingu)->get_pos();
          data->pos.x -= data->speed * delta;
          (*pingu)->set_pos(pos);
        }

Index: conveyor_belt.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- conveyor_belt.hxx   27 Sep 2002 18:36:41 -0000      1.14
+++ conveyor_belt.hxx   28 Sep 2002 11:52:26 -0000      1.15
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_CONVEYOR_BELT_HXX
 #define HEADER_PINGUS_WORLDOBJS_CONVEYOR_BELT_HXX
 
+#include <ClanLib/Display/Display/surface.h>
 #include "../worldobj.hxx"
 #include "../worldobj_data.hxx"
 #include "../editor/rect_editorobj.hxx"

Index: entrance.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/entrance.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- entrance.cxx        27 Sep 2002 11:26:49 -0000      1.1
+++ entrance.cxx        28 Sep 2002 11:52:26 -0000      1.2
@@ -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 "../graphic_context.hxx"
 #include "../world.hxx"
 #include "../pingu_holder.hxx"
@@ -124,7 +125,7 @@
     }
 
   // FIXME: Why do we still have these hardcoded offsets?!
-  gc.draw(surface, CL_Vector(data->pos.x - 32, data->pos.y - 16));
+  gc.draw(surface, Vector(data->pos.x - 32, data->pos.y - 16));
 }
 
 } // namespace WorldObjs

Index: exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/exit.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exit.cxx    27 Sep 2002 16:01:55 -0000      1.1
+++ exit.cxx    28 Sep 2002 11:52:26 -0000      1.2
@@ -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 "../graphic_context.hxx"
 #include "../col_map.hxx"
 #include "../world.hxx"
@@ -65,7 +66,7 @@
 Exit::draw (GraphicContext& gc)
 {
   gc.draw(sprite, data->pos);
-  gc.draw(flag, data->pos + CL_Vector(40, 0));
+  gc.draw(flag, data->pos + Vector(40, 0));
 }
 
 void

Index: fake_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/fake_exit.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fake_exit.cxx       27 Sep 2002 18:36:41 -0000      1.6
+++ fake_exit.cxx       28 Sep 2002 11:52:26 -0000      1.7
@@ -36,7 +36,7 @@
   data->counter.set_speed(2.5);
   data->counter = data->surface.get_num_frames() - 1;
 
-  data->pos -= CL_Vector(data->surface.get_width ()/2, 
data->surface.get_height ());
+  data->pos -= Vector(data->surface.get_width ()/2, data->surface.get_height 
());
 }
 
 FakeExit::~FakeExit()

Index: groundpiece.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/groundpiece.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- groundpiece.hxx     27 Sep 2002 18:36:41 -0000      1.5
+++ groundpiece.hxx     28 Sep 2002 11:52:26 -0000      1.6
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_GROUNDPIECE_HXX
 #define HEADER_PINGUS_WORLDOBJS_GROUNDPIECE_HXX
 
+#include <ClanLib/Display/Display/surface.h>
 #include "../worldobj.hxx"
 
 namespace WorldObjsData {

Index: hotspot.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/hotspot.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hotspot.cxx 27 Sep 2002 18:36:41 -0000      1.3
+++ hotspot.cxx 28 Sep 2002 11:52:26 -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 "../worldobjsdata/hotspot_data.hxx"
 #include "../globals.hxx"
 #include "../graphic_context.hxx"

Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ice_block.cxx       27 Sep 2002 18:36:41 -0000      1.17
+++ ice_block.cxx       28 Sep 2002 11:52:26 -0000      1.18
@@ -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 "../col_map.hxx"
 #include "../game_time.hxx"
 #include "../graphic_context.hxx"

Index: ice_block.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ice_block.hxx       27 Sep 2002 18:36:41 -0000      1.13
+++ ice_block.hxx       28 Sep 2002 11:52:26 -0000      1.14
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_ICE_BLOCK_HXX
 #define HEADER_PINGUS_WORLDOBJS_ICE_BLOCK_HXX
 
+#include <ClanLib/Display/Display/surface.h>
 #include "../worldobj.hxx"
 
 namespace WorldObjsData {

Index: info_box.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- info_box.cxx        27 Sep 2002 18:36:41 -0000      1.15
+++ info_box.cxx        28 Sep 2002 11:52:26 -0000      1.16
@@ -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 <ClanLib/Display/Font/font.h>
 #include <ClanLib/Display/Display/display.h>
 #include "../graphic_context.hxx"
@@ -56,7 +55,7 @@
     {
       int width = Fonts::pingus_small->get_text_width(data->info_text.c_str());
       int border = 6;
-      gc.draw_line(data->pos, data->pos + CL_Vector(0, 0 - 100), 0.0f, 1.0f, 
0.0f, 1.0f);
+      gc.draw_line(data->pos, data->pos + Vector(0, 0 - 100), 0.0f, 1.0f, 
0.0f, 1.0f);
       gc.draw(data->sprite, data->pos);
       CL_Display::fill_rect(x_pos - width/2 - border,
                             y_pos - border,

Index: rain_generator.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/rain_generator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rain_generator.cxx  16 Sep 2002 16:47:41 -0000      1.3
+++ rain_generator.cxx  28 Sep 2002 11:52:26 -0000      1.4
@@ -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 <iostream>
 #include <ClanLib/Display/Display/display.h>
-#include "../world.hxx"
 #include "../particles/particle_holder.hxx"
 #include "../particles/rain_particle.hxx"
 #include "../sound.hxx"
@@ -39,7 +39,7 @@
 }
 
 void 
-RainGenerator::draw(GraphicContext& gc)
+RainGenerator::draw (GraphicContext& gc)
 {
   if (do_thunder)
     {

Index: smasher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- smasher.cxx 27 Sep 2002 18:36:41 -0000      1.9
+++ smasher.cxx 28 Sep 2002 11:52:26 -0000      1.10
@@ -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 "../algo.hxx"
 #include "../col_map.hxx"
 #include "../graphic_context.hxx"

Index: starfield_background.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjs/starfield_background.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- starfield_background.hxx    27 Sep 2002 18:36:41 -0000      1.4
+++ starfield_background.hxx    28 Sep 2002 11:52:26 -0000      1.5
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOJBS_STARFIELD_BACKGROUND_HXX
 #define HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_HXX
 
-#include "../graphic_context.hxx"
+#include <vector>
 #include "../worldobj.hxx"
 
 namespace WorldObjsData {

Index: starfield_background_stars.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjs/starfield_background_stars.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- starfield_background_stars.cxx      24 Sep 2002 14:51:36 -0000      1.2
+++ starfield_background_stars.cxx      28 Sep 2002 11:52:26 -0000      1.3
@@ -82,7 +82,7 @@
 void
 StarfieldBackgroundStars::draw (GraphicContext& gc)
 {
-  gc.draw(sur, CL_Vector (x_pos, y_pos));
+  gc.draw(sur, Vector (x_pos, y_pos));
 }
 
 } // namespace WorldObjs

Index: surface_background.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/surface_background.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- surface_background.cxx      27 Sep 2002 18:36:41 -0000      1.2
+++ surface_background.cxx      28 Sep 2002 11:52:26 -0000      1.3
@@ -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 <ClanLib/Display/SurfaceProviders/canvas.h>
 #include <ClanLib/Display/Display/display.h>
 #include "../graphic_context.hxx"

Index: surface_background.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/surface_background.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- surface_background.hxx      27 Sep 2002 18:36:41 -0000      1.3
+++ surface_background.hxx      28 Sep 2002 11:52:26 -0000      1.4
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HXX
 #define HEADER_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HXX
 
+#include <ClanLib/Display/Display/surface.h>
 #include "../worldobj.hxx"
 #include "../game_counter.hxx"
 

Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- switch_door.cxx     27 Sep 2002 18:36:41 -0000      1.19
+++ switch_door.cxx     28 Sep 2002 11:52:26 -0000      1.20
@@ -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 "../col_map.hxx"
 #include "../graphic_context.hxx"
 #include "../pingu.hxx"
@@ -88,7 +87,7 @@
       
          for (PinguIter pingu = holder->begin (); pingu != holder->end (); 
++pingu)
            {
-             if ((*pingu)->get_x()    > data->switch_pos.x
+             if (   (*pingu)->get_x() > data->switch_pos.x
                  && (*pingu)->get_x() < data->switch_pos.x + 
static_cast<int>(switch_sur.get_width())
                  && (*pingu)->get_y() > data->switch_pos.y
                  && (*pingu)->get_y() < data->switch_pos.y + 
static_cast<int>(switch_sur.get_height()))

Index: switch_door.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- switch_door.hxx     27 Sep 2002 18:36:41 -0000      1.16
+++ switch_door.hxx     28 Sep 2002 11:52:26 -0000      1.17
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_SWITCH_DOOR_HXX
 #define HEADER_PINGUS_WORLDOBJS_SWITCH_DOOR_HXX
 
+#include <ClanLib/Display/Display/surface.h>
 #include "../worldobj.hxx"
 
 namespace WorldObjsData {

Index: teleporter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/teleporter.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- teleporter.cxx      27 Sep 2002 18:36:41 -0000      1.11
+++ teleporter.cxx      28 Sep 2002 11:52:26 -0000      1.12
@@ -17,7 +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 <fstream>
+#include <iostream>
 #include "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "../pingu_holder.hxx"

Index: thunderstorm_background.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjs/thunderstorm_background.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thunderstorm_background.hxx 27 Sep 2002 18:36:41 -0000      1.3
+++ thunderstorm_background.hxx 28 Sep 2002 11:52:26 -0000      1.4
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HXX
 #define HEADER_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HXX
 
+#include <ClanLib/Display/Display/surface.h>
 #include "../worldobj.hxx"
 
 namespace WorldObjsData {