reverted totally pointless commit of rmcruz. size does NOT contain the current power...

[supertux.git] / src / gameobjs.cpp

diff --git a/src/gameobjs.cpp b/src/gameobjs.cpp
index 04b8a59..2d90234 100644 (file)
--- a/src/gameobjs.cpp
+++ b/src/gameobjs.cpp
@@ -26,6 +26,7 @@
 #include "gameobjs.h"
 #include "sprite_manager.h"
 #include "resources.h"
+#include "level.h"
 
 void
 BouncyDistro::init(float x, float y)
@@ -219,9 +220,10 @@ Sprite *img_trampoline[TRAMPOLINE_FRAMES];
 
 void load_object_gfx()
 {
+  char sprite_name[16];
+
   for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
   {
-    char sprite_name[16];
     sprintf(sprite_name, "trampoline-%i", i+1);
     img_trampoline[i] = sprite_manager->load(sprite_name);
   }
@@ -232,11 +234,12 @@ Trampoline::init(float x, float y)
 {
   base.x = x;
   base.y = y;
-
   base.width = 32;
   base.height = 32;
 
   frame = 0;
+  mode = M_NORMAL;
+  physic.reset();
 }
 
 void
@@ -253,26 +256,53 @@ Trampoline::draw()
 void
 Trampoline::action(double frame_ratio)
 {
-  physic.apply(frame_ratio, base.x, base.y);
+  // TODO: Remove if we're too far off the screen
 
   // Falling
-  if (issolid(base.x + base.width/2, base.y + base.height))
+  if (mode != M_HELD)
   {
-    base.y = int((base.y + base.height)/32) * 32 - base.height;
+    if (issolid(base.x + base.width/2, base.y + base.height))
+    {
+      base.y = int((base.y + base.height)/32) * 32 - base.height;
+
+      physic.enable_gravity(false);
+      physic.set_velocity_y(0.0f);
 
-    physic.enable_gravity(false);
-    physic.set_velocity_y(0.0f);
+      physic.set_velocity_x(0);
+    }
+    else
+    {
+      physic.enable_gravity(true);
+    }
   }
-  else
-    physic.enable_gravity(true);
+  else // Player is carrying us around
+  {
+    /* FIXME: The trampoline object shouldn't know about pplayer objects. */
+    /* If we're holding the iceblock */
+    Player& tux = *World::current()->get_tux();
+    Direction dir = tux.dir;
 
-}
+    if(dir == RIGHT)
+    {
+      base.x = tux.base.x + 16;
+      base.y = tux.base.y + tux.base.height/1.5 - base.height;
+    }
+    else /* facing left */
+    {
+      base.x = tux.base.x - 16;
+      base.y = tux.base.y + tux.base.height/1.5 - base.height;
+    }
+
+    if(collision_object_map(base))
+    {
+      base.x = tux.base.x;
+      base.y = tux.base.y + tux.base.height/1.5 - base.height;
+    }
+  }
 
-// TODO:
-// If HELD
-//   - move with tux
-// If jumped on
-//   - compress springs (reduce height)
+  physic.apply(frame_ratio, base.x, base.y);
+  collision_swept_object_map(&old_base, &base);
+}
 
 void
 Trampoline::collision(void *p_c_object, int c_object, CollisionType type)
@@ -285,14 +315,11 @@ Trampoline::collision(void *p_c_object, int c_object, CollisionType type)
 
       if (type == COLLISION_NORMAL)
       {
-        // TODO: Pick up if HELD
+        // Pick up if HELD (done in Player)
       }
 
       else if (type == COLLISION_SQUISH)
       {
-        // TODO: compress springs
-        // TODO: launch tux, if necessary
-
         int squish_amount = (32 - (int)pplayer_c->base.y % 32);
 
         if (squish_amount < 24)
@@ -304,10 +331,10 @@ Trampoline::collision(void *p_c_object, int c_object, CollisionType type)
         else
           frame = 0;
 
-        if (squish_amount < 24)
-        {
-          pplayer_c->physic.set_velocity_y(8);
-        }
+        if (squish_amount < 20)
+          pplayer_c->physic.set_velocity_y(power);
+        else if (pplayer_c->physic.get_velocity_y() < 0)
+          pplayer_c->physic.set_velocity_y(-squish_amount/32);
       }
 
       break;