super-tux-commit Mailing List for Super Tux (Page 66)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23403

Modified Files:
	gameobjs.cpp gameobjs.h player.cpp 
Log Message:
- tux can now pick up trampoline

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96

--- player.cpp	16 May 2004 05:48:28 -0000	1.95
+++ player.cpp	17 May 2004 05:24:40 -0000	1.96
@@ -18,6 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <math.h>
+#include <iostream>
+#include <iostream>
 #include <cassert>
 #include "gameloop.h"
 #include "globals.h"
@@ -699,19 +701,43 @@
     case CO_TRAMPOLINE:
       ptramp_c = (Trampoline*) p_c_object;
       
-      if (physic.get_velocity_x() > 0) // RIGHT
+      // Pick up trampoline
+      if (ptramp_c->mode != Trampoline::M_HELD && input.fire == DOWN && !holding_something)
       {
-        physic.set_velocity_x(0);
-        base.x = ptramp_c->base.x - base.width;
+        holding_something = true;
+        ptramp_c->mode = Trampoline::M_HELD;
+        ptramp_c->base.y -= 8;
       }
-      else if (physic.get_velocity_x() < 0) // LEFT
+      // Set down trampoline
+      else if (ptramp_c->mode == Trampoline::M_HELD && input.fire != DOWN)
       {
-        physic.set_velocity_x(0);
-        base.x = ptramp_c->base.x + ptramp_c->base.width;
+        holding_something = false;
+        ptramp_c->mode = Trampoline::M_NORMAL;
+        ptramp_c->base.y += 8;
+        ptramp_c->physic.set_velocity(physic.get_velocity_x(), physic.get_velocity_y());
+
+        //if (dir == RIGHT)
+        //  ptramp_c->base.x = base.x + base.width+1;
+        //else /* LEFT */
+        //  ptramp_c->base.x = base.x - base.width-1;
       }
-      else
+/*
+      // Don't let tux walk through trampoline
+      else if (ptramp_c->mode != Trampoline::M_HELD && on_ground())
       {
+        if (physic.get_velocity_x() > 0) // RIGHT
+        {
+          physic.set_velocity_x(0);
+          base.x = ptramp_c->base.x - base.width;
+        }
+        else if (physic.get_velocity_x() < 0) // LEFT
+        {
+          physic.set_velocity_x(0);
+          base.x = ptramp_c->base.x + ptramp_c->base.width;
+        }
       }
+*/
+
       break;
 
     default:

Index: gameobjs.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gameobjs.cpp	17 May 2004 01:24:24 -0000	1.22
+++ gameobjs.cpp	17 May 2004 05:24:40 -0000	1.23
@@ -26,6 +26,7 @@
 #include "gameobjs.h"
 #include "sprite_manager.h"
 #include "resources.h"
+#include "level.h"
 
 void
 BouncyDistro::init(float x, float y)
@@ -232,11 +233,12 @@
 {
   base.x = x;
   base.y = y;
-
   base.width = 32;
   base.height = 32;
 
   frame = 0;
+  mode = M_NORMAL;
+  physic.reset();
 }
 
 void
@@ -256,23 +258,47 @@
   physic.apply(frame_ratio, base.x, base.y);
 
   // 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;
+    }
 
-// TODO:
-// If HELD
-//   - move with tux
-// If jumped on
-//   - compress springs (reduce height)
+    if(collision_object_map(base))
+    {
+      base.x = tux.base.x;
+      base.y = tux.base.y + tux.base.height/1.5 - base.height;
+    }
+  }
+}
 
 void
 Trampoline::collision(void *p_c_object, int c_object, CollisionType type)
@@ -285,14 +311,11 @@
 
       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)

Index: gameobjs.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gameobjs.h	17 May 2004 01:24:24 -0000	1.15
+++ gameobjs.h	17 May 2004 05:24:40 -0000	1.16
@@ -131,6 +131,7 @@
   void collision(void *p_c_object, int c_object, CollisionType type);
 
   Physic physic;
+  enum { M_NORMAL, M_HELD } mode;
 
  private:
   float power;





2004	Jan	Feb	Mar (94)	Apr (500)	May (531)	Jun (196)	Jul (224)	Aug (193)	Sep (117)	Oct (115)	Nov (319)	Dec (97)
2005	Jan (19)	Feb	Mar (105)	Apr (41)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (6)
2007	Jan (1)	Feb (2)	Mar	Apr (1)	May	Jun	Jul (2)	Aug (2)	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar	Apr	May (1)	Jun (4)	Jul	Aug	Sep (7)	Oct (12)	Nov (26)	Dec (39)
2009	Jan (6)	Feb (15)	Mar (10)	Apr (25)	May (29)	Jun (21)	Jul (26)	Aug (8)	Sep (3)	Oct	Nov	Dec (10)
2010	Jan (5)	Feb (5)	Mar (2)	Apr	May (5)	Jun	Jul (1)	Aug (2)	Sep (2)	Oct (2)	Nov	Dec

super-tux-commit Mailing List for Super Tux (Page 66)

super-tux-commit — Messages about commits to the sourcecode.