A couple of improvements for the flying platform.

SVN-Revision: 1333

diff --git a/src/gameobjs.cpp b/src/gameobjs.cpp
index 743d9cb..76722c7 100644 (file)
--- a/src/gameobjs.cpp
+++ b/src/gameobjs.cpp
@@ -302,6 +302,11 @@ FlyingPlatform::FlyingPlatform(DisplayManager& displaymanager, LispReader& reade
   point = 0;
   move = false;
 
+  float x = pos_x[point+1] - pos_x[point];
+  float y = pos_y[point+1] - pos_y[point];
+  vel_x = x*velocity / sqrt(x*x + y*y);
+  vel_y = -(velocity - vel_x);
+
   frame = 0;
 }
 
@@ -341,6 +346,11 @@ if((unsigned)point+1 != pos_x.size())
       pos_y[point] == pos_y[point+1]))
     {
     point++;
+
+    float x = pos_x[point+1] - pos_x[point];
+    float y = pos_y[point+1] - pos_y[point];
+    vel_x = x*velocity / sqrt(x*x + y*y);
+    vel_y = -(velocity - vel_x);
     }
   }
 else   // last point
@@ -349,7 +359,7 @@ else   // last point
   // reverse vector
   return;
   }
-
+/*
 if(pos_x[point+1] > base.x)
   base.x += velocity * frame_ratio;
 else if(pos_x[point+1] < base.x)
@@ -359,15 +369,10 @@ if(pos_y[point+1] > base.y)
   base.y += velocity * frame_ratio;
 else if(pos_y[point+1] < base.y)
   base.y -= velocity * frame_ratio;
-/*
-float x = pos_x[point+1] - pos_x[point];
-float y = pos_y[point+1] - pos_y[point];
-float vel_x = x*velocity / sqrt(x*x + y*y);
-float vel_y = velocity - vel_x;
+*/
 
 base.x += vel_x * frame_ratio;
 base.y += vel_y * frame_ratio;
-*/
 }
 
 void

diff --git a/src/gameobjs.h b/src/gameobjs.h
index ff2e31e..49515a3 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -132,6 +132,9 @@ public:
   virtual void collision(const MovingObject& other, int);
   void collision(void *p_c_object, int c_object, CollisionType type);
 
+  float get_vel_x() { return vel_x; }
+  float get_vel_y() { return vel_y; }
+
   Physic physic;
   enum { M_NORMAL, M_HELD } mode;
 
@@ -140,6 +143,8 @@ public:
   std::vector<int> pos_y;
   float velocity;
 
+  float vel_x, vel_y;  // calculated based in the velocity
+
   int point;
   bool move;
   unsigned int frame;

diff --git a/src/player.cpp b/src/player.cpp
index 1c34939..04af10f 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -822,7 +822,11 @@ Player::collision(void* p_c_object, int c_object)
       pplatform_c = (FlyingPlatform*) p_c_object;
       
       base.y = pplatform_c->base.y - base.height;
+      physic.set_velocity_x(pplatform_c->get_vel_x());
+      
       physic.enable_gravity(false);
+      can_jump = true;
+      fall_mode = ON_GROUND;
       break;
 
     default: