[Pingus-CVS] CVS: Games/Pingus/src pingu_enums.cxx,1.3,1.4 world.cxx,1.43,1.44 world.hxx,1.26,1.27

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv31012

Modified Files:
        pingu_enums.cxx world.cxx world.hxx 
Log Message:
gervases faller-slowdown patch

Index: pingu_enums.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingu_enums.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pingu_enums.cxx     12 Feb 2003 22:40:47 -0000      1.3
+++ pingu_enums.cxx     25 Mar 2003 00:56:33 -0000      1.4
@@ -19,9 +19,10 @@
 
 #include "pingu_enums.hxx"
 
-// Pingu "globals"
+// Pingu "globals".  Make [deadly_velocity = 20 * sqrt("normal gravity")] so
+// that the "deadly distance" is the same and therefore doesn't break levels.
+const float deadly_velocity = 10.0f;
 const int pingu_height = 26;
-const float deadly_velocity = 20.0f;
 
 namespace Actions {
 

Index: world.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/world.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- world.cxx   25 Mar 2003 00:37:44 -0000      1.43
+++ world.cxx   25 Mar 2003 00:56:33 -0000      1.44
@@ -47,7 +47,8 @@
     do_armageddon(false),
     pingus(new PinguHolder(plf)),
     colmap(gfx_map->get_colmap()),
-    view(0)
+    view(0),
+    gravitational_acceleration(0.25f)
 { 
   WorldObj::set_world(this);
 
@@ -292,6 +293,11 @@
 World::get_game_time ()
 {
   return game_time;
+}
+
+float World::get_gravity()
+{
+  return gravitational_acceleration;
 }
 
 /* EOF */

Index: world.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/world.hxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- world.hxx   3 Mar 2003 20:32:18 -0000       1.26
+++ world.hxx   25 Mar 2003 00:56:33 -0000      1.27
@@ -94,6 +94,9 @@
 
   void    init_worldobjs (PLF* plf);
 
+  /** Acceleration due to gravity in the world */
+  const float gravitational_acceleration;
+
 public:
   World(PLF*);
   virtual ~World();
@@ -171,6 +174,10 @@
   
   int get_start_x() const { return start_x_pos; }
   int get_start_y() const { return start_y_pos; }
+
+  /** Get the acceleration due to gravity in the world */
+  float get_gravity();
+
 private:
   World (const World&);
   World& operator= (const World&);