From 467b067db7d227c37319e0dbc24ff6d387f567b3 Mon Sep 17 00:00:00 2001 From: Wolfgang Becker Date: Sat, 15 Jul 2006 16:22:27 +0000 Subject: [PATCH] Fixed multi hit bricks, adjust comments in trampoline SVN-Revision: 4022 --- data/images/tiles.strf | 6 ++++-- src/object/trampoline.cpp | 12 +++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/data/images/tiles.strf b/data/images/tiles.strf index 5885a0b59..cc5574277 100644 --- a/data/images/tiles.strf +++ b/data/images/tiles.strf @@ -989,7 +989,8 @@ ) (solid #t) (brick #t) - (data 84) + (data 1) + (next-tile 84) ) (tile (id 105) @@ -998,7 +999,8 @@ ) (solid #t) (brick #t) - (data 84) + (data 1) + (next-tile 84) ) (tile (id 106) diff --git a/src/object/trampoline.cpp b/src/object/trampoline.cpp index 9e1c351d9..496e5ab33 100644 --- a/src/object/trampoline.cpp +++ b/src/object/trampoline.cpp @@ -25,12 +25,11 @@ #include "audio/sound_manager.hpp" #include "sprite/sprite_manager.hpp" -/* Trampoline will accelerate player by VY_FACTOR (or to VY_INITIAL if - * that's faster) if he jumps on it. Acceleration is capped at VY_MIN. */ +/* Trampoline will accelerate player to to VY_INITIAL, if + * he jumps on it to VY_MIN. */ namespace{ static const std::string TRAMPOLINE_SOUND = "sounds/trampoline.wav"; static const float VY_MIN = -1000; //negative, upwards - static const float VY_FACTOR = -1.5; static const float VY_INITIAL = -500; } @@ -39,7 +38,8 @@ Trampoline::Trampoline(const lisp::Lisp& lisp) { sound_manager->preload( TRAMPOLINE_SOUND ); flags |= FLAG_PORTABLE; - physic.set_velocity_y(0); + flags |= FLAG_SOLID; + physic.set_velocity(0, 0); physic.enable_gravity(true); on_ground = false; @@ -93,6 +93,8 @@ Trampoline::collision(GameObject& other, const CollisionHit& hit ) } return SOLID; //TODO: Nobody should be able to walk through the trampoline. + // but to make this work we have to be in COLGROUP_STATIC which would + // break jumping and grabbing. } void @@ -114,7 +116,7 @@ void Trampoline::ungrab(MovingObject& , Direction ){ set_group( COLGROUP_MOVING ); on_ground = false; - physic.set_velocity_y(0); + physic.set_velocity(0, 0); } -- 2.11.0