[Super-tux-commit] supertux/src gameobjs.cpp,1.21,1.22 gameobjs.h,1.14,1.15 level.cpp,1.75,1.76 world.cpp,1.95,1.96

[Ryan F. <sik...@us...>]

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

Modified Files:
	gameobjs.cpp gameobjs.h level.cpp world.cpp 
Log Message:
- trampoline stuff

Index: gameobjs.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gameobjs.h	16 May 2004 16:49:13 -0000	1.14
+++ gameobjs.h	17 May 2004 01:24:24 -0000	1.15
@@ -110,7 +110,7 @@
 /* Trampoline */
 struct TrampolineData
 {
-  int power;
+  float power;
 };
 
 class Trampoline : public GameObject
@@ -133,7 +133,7 @@
   Physic physic;
 
  private:
-  int power;
+  float power;
   unsigned int frame;
 };
 

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- level.cpp	16 May 2004 12:18:05 -0000	1.75
+++ level.cpp	17 May 2004 01:24:24 -0000	1.76
@@ -416,7 +416,7 @@
                       _trampoline_data.type = OBJ_TRAMPOLINE;
                       reader.read_int("x", &_trampoline_data.x);
                       reader.read_int("y", &_trampoline_data.y);
-                      reader.read_int("power", &_trampoline_data.type_specific.power);
+                      reader.read_float("power", &_trampoline_data.type_specific.power);
 
                       trampoline_data.push_back(_trampoline_data);
                     }

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- world.cpp	16 May 2004 05:48:28 -0000	1.95
+++ world.cpp	17 May 2004 01:24:24 -0000	1.96
@@ -511,7 +511,7 @@
       {
         (*i)->collision(&tux, CO_PLAYER, COLLISION_SQUISH);
       }
-      else
+      else if (tux.previous_base.y <= tux.base.y)
       {
         tux.collision(*i, CO_TRAMPOLINE);
         (*i)->collision(&tux, CO_PLAYER, COLLISION_NORMAL);

Index: gameobjs.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gameobjs.cpp	16 May 2004 16:49:13 -0000	1.21
+++ gameobjs.cpp	17 May 2004 01:24:24 -0000	1.22
@@ -305,9 +305,9 @@
           frame = 0;
 
         if (squish_amount < 24)
-        {
-          pplayer_c->physic.set_velocity_y(8);
-        }
+          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;