[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.10,1.11 basher.cxx,1.14,1.15 blocker.cxx,1.8,1.9 boarder.cxx,1.8,1.9 bomber.cxx,1.12,1.13 bridger.cxx,1.14,1.15 climber.cxx,1.10,1.11 digger.cxx,1.12,1.13 drown.cxx,1.7,1.8 exiter.cxx,1.7,1.8 faller.cxx,1.21,1.22 floater.cxx,1.14,1.15 jumper.cxx,1.11,1.12 laser_kill.cxx,1.6,1.7 miner.cxx,1.10,1.11 rocket_launcher.cxx,1.8,1.9 slider.cxx,1.8,1.9 smashed.cxx,1.6,1.7 splashed.cxx,1.7,1.8 superman.cxx,1.6,1.7 teleported.cxx,1.7,1.8 waiter.cxx,1.7,1.8 walker.cxx,1.21,1.22

[torangan]

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

Modified Files:
        angel.cxx basher.cxx blocker.cxx boarder.cxx bomber.cxx 
        bridger.cxx climber.cxx digger.cxx drown.cxx exiter.cxx 
        faller.cxx floater.cxx jumper.cxx laser_kill.cxx miner.cxx 
        rocket_launcher.cxx slider.cxx smashed.cxx splashed.cxx 
        superman.cxx teleported.cxx waiter.cxx walker.cxx 
Log Message:
- splitted IceBlock / ConveyorBelt
- removed unrequired includes (ignoring system headers)


Index: angel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/angel.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- angel.cxx   10 Sep 2002 19:24:19 -0000      1.10
+++ angel.cxx   14 Sep 2002 19:06:33 -0000      1.11
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <math.h>
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "../pingus_resource.hxx"
 #include "../string_converter.hxx"

Index: basher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/basher.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- basher.cxx  10 Sep 2002 19:24:19 -0000      1.14
+++ basher.cxx  14 Sep 2002 19:06:33 -0000      1.15
@@ -17,12 +17,13 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../col_map.hxx"
+#include "../debug.hxx"
+#include "../globals.hxx"
+#include "../graphic_context.hxx"
 #include "../pingu_map.hxx"
-#include "../world.hxx"
 #include "../pingus_resource.hxx"
-#include "../globals.hxx"
 #include "../pingu.hxx"
-#include "../debug.hxx"
+#include "../world.hxx"
 #include "basher.hxx"
 
 using namespace std;

Index: blocker.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/blocker.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- blocker.cxx 10 Sep 2002 19:24:19 -0000      1.8
+++ blocker.cxx 14 Sep 2002 19:06:33 -0000      1.9
@@ -18,11 +18,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-
 #include "../col_map.hxx"
-#include "../sprite.hxx"
-#include "../pingus_resource.hxx"
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
+#include "../pingus_resource.hxx"
 #include "../string_converter.hxx"
 #include "blocker.hxx"
 

Index: boarder.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/boarder.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- boarder.cxx 10 Sep 2002 19:24:19 -0000      1.8
+++ boarder.cxx 14 Sep 2002 19:06:33 -0000      1.9
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/Math/cl_vector.h>
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "../pingus_resource.hxx"
 #include "../string_converter.hxx"

Index: bomber.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/bomber.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bomber.cxx  10 Sep 2002 19:24:19 -0000      1.12
+++ bomber.cxx  14 Sep 2002 19:06:33 -0000      1.13
@@ -17,15 +17,14 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "../pingu_map.hxx"
 #include "../col_map.hxx"
-#include "../world.hxx"
-#include "../globals.hxx"
-#include "../pingus_resource.hxx"
 #include "../force_vector.hxx"
-#include "../string_converter.hxx"
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
-#include "../sounds.hxx"
+#include "../pingu_map.hxx"
+#include "../pingus_resource.hxx"
+#include "../string_converter.hxx"
+#include "../world.hxx"
 #include "../particles/particle_holder.hxx"
 #include "bomber.hxx"
 
@@ -35,11 +34,10 @@
 CL_Surface Bomber::bomber_radius;
 CL_Surface Bomber::bomber_radius_gfx;
 
-Bomber::Bomber() 
-  : particle_thrown(false),
-    sound_played(false), 
-    gfx_exploded(false),
-    colmap_exploded(false)
+Bomber::Bomber () : particle_thrown(false),
+                    sound_played(false), 
+                    gfx_exploded(false),
+                    colmap_exploded(false)
 {
 }
 
@@ -125,7 +123,7 @@
 }
 
 void
-Bomber::update_position(float delta)
+Bomber::update_position (float delta)
 {
   // Apply all forces
   pingu->set_velocity(ForcesHolder::apply_forces(pingu->get_pos(), 
pingu->get_velocity()));

Index: bridger.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/bridger.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bridger.cxx 10 Sep 2002 19:24:19 -0000      1.14
+++ bridger.cxx 14 Sep 2002 19:06:33 -0000      1.15
@@ -18,14 +18,14 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <cassert>
+#include "../col_map.hxx"
+#include "../graphic_context.hxx"
+#include "../pingu.hxx"
 #include "../pingu_map.hxx"
-#include "../world.hxx"
 #include "../pingus_resource.hxx"
 #include "../sound.hxx"
-#include "../algo.hxx"
-#include "../col_map.hxx"
 #include "../string_converter.hxx"
-#include "../pingu.hxx"
+#include "../world.hxx"
 #include "bridger.hxx"
 
 using namespace std;

Index: climber.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/climber.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- climber.cxx 10 Sep 2002 19:24:19 -0000      1.10
+++ climber.cxx 14 Sep 2002 19:06:33 -0000      1.11
@@ -17,8 +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 "../pingu.hxx"
 #include "../col_map.hxx"
+#include "../graphic_context.hxx"
+#include "../pingu.hxx"
 #include "climber.hxx"
 
 namespace Actions {

Index: digger.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/digger.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- digger.cxx  10 Sep 2002 19:24:19 -0000      1.12
+++ digger.cxx  14 Sep 2002 19:06:33 -0000      1.13
@@ -18,8 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <cstdio>
-
 #include "../col_map.hxx"
+#include "../graphic_context.hxx"
 #include "../pingu_map.hxx"
 #include "../world.hxx"
 #include "../pingus_resource.hxx"

Index: drown.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/drown.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- drown.cxx   10 Sep 2002 19:24:19 -0000      1.7
+++ drown.cxx   14 Sep 2002 19:06:33 -0000      1.8
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/Math/cl_vector.h>
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "drown.hxx"
 

Index: exiter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/exiter.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exiter.cxx  10 Sep 2002 19:24:19 -0000      1.7
+++ exiter.cxx  14 Sep 2002 19:06:33 -0000      1.8
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/Math/cl_vector.h>
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "../sound.hxx"
 #include "exiter.hxx"

Index: faller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/faller.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- faller.cxx  10 Sep 2002 19:24:19 -0000      1.21
+++ faller.cxx  14 Sep 2002 19:06:33 -0000      1.22
@@ -18,13 +18,13 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <math.h>
-
 #include "../col_map.hxx"
-#include "../globals.hxx"
+#include "../debug.hxx"
 #include "../force_vector.hxx"
-#include "../string_converter.hxx"
+#include "../globals.hxx"
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
-#include "../debug.hxx"
+#include "../string_converter.hxx"
 #include "faller.hxx"
 
 namespace Actions {

Index: floater.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/floater.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- floater.cxx 10 Sep 2002 19:24:19 -0000      1.14
+++ floater.cxx 14 Sep 2002 19:06:33 -0000      1.15
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../pingu.hxx"
+#include "../graphic_context.hxx"
 #include "../groundpiece_data.hxx"
 #include "floater.hxx"
 

Index: jumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/jumper.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jumper.cxx  13 Sep 2002 18:28:26 -0000      1.11
+++ jumper.cxx  14 Sep 2002 19:06:33 -0000      1.12
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/Math/cl_vector.h>
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "../string_converter.hxx"
 #include "jumper.hxx"

Index: laser_kill.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/laser_kill.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- laser_kill.cxx      13 Sep 2002 18:28:26 -0000      1.6
+++ laser_kill.cxx      14 Sep 2002 19:06:33 -0000      1.7
@@ -17,6 +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 <ClanLib/Core/Math/cl_vector.h>
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "laser_kill.hxx"
 
@@ -27,31 +29,31 @@
 }
 
 void
-LaserKill::init(void)
+LaserKill::init (void)
 {
   sprite = Sprite ("Other/laser_kill", "pingus",
                   20.0f, Sprite::NONE, Sprite::ONCE);
-  sprite.set_align_center_bottom ();
+  sprite.set_align_center_bottom();
 }
 
 void 
 LaserKill::draw (GraphicContext& gc)
 {
   if (pingu->direction.is_left())
-    sprite.set_direction (Sprite::LEFT);
+    sprite.set_direction(Sprite::LEFT);
   else
-    sprite.set_direction (Sprite::RIGHT);
+    sprite.set_direction(Sprite::RIGHT);
 
-  gc.draw(sprite, pingu->get_pos () - CL_Vector (0, 2));
+  gc.draw(sprite, pingu->get_pos() - CL_Vector(0, 2));
 }
 
 void
-LaserKill::update(float delta)
+LaserKill::update (float delta)
 {
-  if (sprite.finished ())
+  if (sprite.finished())
     pingu->set_status(PS_DEAD);
 
-  sprite.update (delta);
+  sprite.update(delta);
 }
 
 } // namespace Actions

Index: miner.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/miner.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- miner.cxx   10 Sep 2002 19:24:19 -0000      1.10
+++ miner.cxx   14 Sep 2002 19:06:33 -0000      1.11
@@ -19,6 +19,7 @@
 
 #include "../pingu_map.hxx"
 #include "../col_map.hxx"
+#include "../graphic_context.hxx"
 #include "../world.hxx"
 #include "../pingus_resource.hxx"
 #include "../sound.hxx"

Index: rocket_launcher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/rocket_launcher.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rocket_launcher.cxx 10 Sep 2002 19:24:19 -0000      1.8
+++ rocket_launcher.cxx 14 Sep 2002 19:06:33 -0000      1.9
@@ -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 "../graphic_context.hxx"
 #include "../particles/particle_holder.hxx"
 #include "../particles/explosive_particle.hxx"
 #include "../world.hxx"

Index: slider.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/slider.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- slider.cxx  10 Sep 2002 19:24:19 -0000      1.8
+++ slider.cxx  14 Sep 2002 19:06:33 -0000      1.9
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../col_map.hxx"
+#include "../graphic_context.hxx"
 #include "../string_converter.hxx"
 #include "../pingu.hxx"
 #include "slider.hxx"

Index: smashed.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/smashed.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- smashed.cxx 10 Sep 2002 19:24:19 -0000      1.6
+++ smashed.cxx 14 Sep 2002 19:06:33 -0000      1.7
@@ -17,6 +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 <ClanLib/Core/Math/cl_vector.h>
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "smashed.hxx"
 

Index: splashed.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/splashed.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- splashed.cxx        10 Sep 2002 19:24:19 -0000      1.7
+++ splashed.cxx        14 Sep 2002 19:06:33 -0000      1.8
@@ -18,9 +18,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/Math/cl_vector.h>
+#include "../graphic_context.hxx"
 #include "../world.hxx"
 #include "../pingu.hxx"
-#include "../sound.hxx"
 #include "../worldobj.hxx"
 #include "splashed.hxx"
 

Index: superman.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/superman.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- superman.cxx        10 Sep 2002 19:24:19 -0000      1.6
+++ superman.cxx        14 Sep 2002 19:06:33 -0000      1.7
@@ -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 "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "../pingus_resource.hxx"
 #include "../string_converter.hxx"

Index: teleported.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/teleported.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- teleported.cxx      10 Sep 2002 19:24:19 -0000      1.7
+++ teleported.cxx      14 Sep 2002 19:06:33 -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 "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "teleported.hxx"
 

Index: waiter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/waiter.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- waiter.cxx  10 Sep 2002 19:24:19 -0000      1.7
+++ waiter.cxx  14 Sep 2002 19:06:33 -0000      1.8
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/Math/cl_vector.h>
+#include "../graphic_context.hxx"
 #include "../pingu.hxx"
 #include "../pingus_resource.hxx"
 #include "waiter.hxx"

Index: walker.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/walker.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- walker.cxx  10 Sep 2002 19:24:19 -0000      1.21
+++ walker.cxx  14 Sep 2002 19:06:33 -0000      1.22
@@ -19,6 +19,7 @@
 
 #include "../col_map.hxx"
 #include "../globals.hxx"
+#include "../graphic_context.hxx"
 #include "../string_converter.hxx"
 #include "../pingu.hxx"
 #include "../debug.hxx"