- added spikes

[supertux.git] / src / gameobjs.cpp

diff --git a/src/gameobjs.cpp b/src/gameobjs.cpp
index a48412f..3a1eeac 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)
@@ -223,7 +224,7 @@ void load_object_gfx()
   {
     char sprite_name[16];
     sprintf(sprite_name, "trampoline-%i", i+1);
-    img_trampoline[0] = sprite_manager->load(sprite_name);
+    img_trampoline[i] = sprite_manager->load(sprite_name);
   }
 }
 
@@ -232,40 +233,115 @@ 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
+Trampoline::draw()
+{
+  img_trampoline[frame]->draw((int)base.x, (int)base.y);
+
+  frame = 0;
+
+  if (debug_mode)
+    fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75, 75, 0, 150);
 }
 
 void
 Trampoline::action(double frame_ratio)
 {
+  // TODO: Remove if we're too far off the screen
+
   physic.apply(frame_ratio, base.x, base.y);
 
+  // Falling
+  if (mode != M_HELD)
+  {
+    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);
 
-  if (issolid(base.x + base.width/2, base.y + base.height))
+      physic.set_velocity_x(0);
+    }
+    else
+    {
+      physic.enable_gravity(true);
+    }
+  }
+  else // Player is carrying us around
   {
-    base.y = int((base.y + base.height)/32) * 32 - base.height;
+    /* 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;
+    }
 
-    physic.enable_gravity(false);
-    physic.set_velocity_y(0.0f);
+    if(collision_object_map(base))
+    {
+      base.x = tux.base.x;
+      base.y = tux.base.y + tux.base.height/1.5 - base.height;
+    }
   }
-  else
-    physic.enable_gravity(true);
-
-  // TODO:
-  // If HELD
-  //   - move with tux
-  // If jumped on
-  //   - compress springs (reduce height)
 }
 
 void
-Trampoline::draw()
+Trampoline::collision(void *p_c_object, int c_object, CollisionType type)
 {
-  img_trampoline[0]->draw((int)base.x, (int)base.y);
+  Player* pplayer_c = NULL;
+  switch (c_object)
+  {
+    case CO_PLAYER:
+      pplayer_c = (Player*) p_c_object;
+
+      if (type == COLLISION_NORMAL)
+      {
+        // Pick up if HELD (done in Player)
+      }
+
+      else if (type == COLLISION_SQUISH)
+      {
+        int squish_amount = (32 - (int)pplayer_c->base.y % 32);
+
+        if (squish_amount < 24)
+          frame = 3;
+        else if (squish_amount < 28)
+          frame = 2;
+        else if (squish_amount < 30)
+          frame = 1;
+        else
+          frame = 0;
+
+        if (squish_amount < 24)
+          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;
+
+    default:
+      break;
+    
+  }
 }
 
-
 /* EOF */