X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Ftrampoline.cpp;h=3b6630c39234e04d01441b365975de46f4fb6089;hb=84abfaeb33c5bf8dac0cfd9499d9d4c3e7d39881;hp=0260e950e74ca4820a6fb92d256fa0a6fc4140de;hpb=03c7149dc895355c144d71e4546329ab97d2a7e8;p=supertux.git diff --git a/src/object/trampoline.cpp b/src/object/trampoline.cpp index 0260e950e..3b6630c39 100644 --- a/src/object/trampoline.cpp +++ b/src/object/trampoline.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux - Trampoline // Copyright (C) 2006 Wolfgang Becker -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,120 +12,115 @@ // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// along with this program. If not, see . -#include - -#include "trampoline.hpp" -#include "object_factory.hpp" -#include "player.hpp" #include "audio/sound_manager.hpp" +#include "badguy/walking_badguy.hpp" +#include "control/controller.hpp" +#include "object/player.hpp" +#include "object/trampoline.hpp" +#include "sprite/sprite.hpp" #include "sprite/sprite_manager.hpp" +#include "supertux/object_factory.hpp" -/* Trampoline will accelerate player to to VY_INITIAL, if +/* Trampoline will accelerate player to to VY_INITIAL, if * he jumps on it to VY_MIN. */ namespace { - const std::string TRAMPOLINE_SOUND = "sounds/trampoline.wav"; - const float VY_MIN = -900; //negative, upwards - const float VY_INITIAL = -500; +const std::string TRAMPOLINE_SOUND = "sounds/trampoline.wav"; +const float VY_MIN = -900; //negative, upwards +const float VY_INITIAL = -500; } -Trampoline::Trampoline(const lisp::Lisp& lisp) - : MovingSprite(lisp, "images/objects/trampoline/trampoline.sprite" ) +Trampoline::Trampoline(const Reader& lisp) : + Rock(lisp, "images/objects/trampoline/trampoline.sprite"), + portable(true) { - sound_manager->preload( TRAMPOLINE_SOUND ); - flags |= FLAG_PORTABLE; - physic.set_velocity(0, 0); - physic.enable_gravity(true); - on_ground = false; + sound_manager->preload(TRAMPOLINE_SOUND); - bool portable = true; //Check if this trampoline is not portable - if( lisp.get( "portable", portable ) ){ - if( !portable ){ - flags ^= FLAG_PORTABLE; - //we need another sprite - sprite_name = "images/objects/trampoline/trampoline_fix.sprite"; - sprite = sprite_manager->create( sprite_name ); - sprite->set_action("normal"); + if(lisp.get("portable", portable)) { + if(!portable) { + //we need another sprite + sprite_name = "images/objects/trampoline/trampoline_fix.sprite"; + sprite = sprite_manager->create(sprite_name); + sprite->set_action("normal"); } } } void -Trampoline::update( float elapsed_time ){ - if( !on_ground ){ - movement = physic.get_movement(elapsed_time); - } - if(sprite->animation_done()) { - sprite->set_action("normal"); - } +Trampoline::update(float elapsed_time) +{ + if(sprite->animation_done()) { + sprite->set_action("normal"); + } + + Rock::update(elapsed_time); } HitResponse -Trampoline::collision(GameObject& other, const CollisionHit& hit ) +Trampoline::collision(GameObject& other, const CollisionHit& hit) { + //Tramponine has to be on ground to work. - if( !on_ground ){ - return FORCE_MOVE; - } - Player* player = dynamic_cast (&other); - if ( player ) { - float vy = player->physic.get_velocity_y(); - //player is falling down on trampoline - if(hit.top && vy > 0) { - if(player->get_controller()->hold(Controller::JUMP)) { - vy = VY_MIN; - } else { - vy = VY_INITIAL; + if(on_ground) { + Player* player = dynamic_cast (&other); + //Trampoline works for player + if(player) { + float vy = player->get_physic().get_velocity_y(); + //player is falling down on trampoline + if(hit.top && vy >= 0) { + if(player->get_controller()->hold(Controller::JUMP)) { + vy = VY_MIN; + } else { + vy = VY_INITIAL; + } + player->get_physic().set_velocity_y(vy); + sound_manager->play(TRAMPOLINE_SOUND); + sprite->set_action("swinging", 1); + return FORCE_MOVE; } - player->physic.set_velocity_y( vy ); - sound_manager->play( TRAMPOLINE_SOUND ); - sprite->set_action("swinging", 1); - return FORCE_MOVE; } - } - //Fake being solid for moving_object. - MovingObject* moving_object = dynamic_cast (&other); - if( moving_object ){ - if( hit.top ){ - float inside = moving_object->get_bbox().get_bottom() - get_bbox().get_top(); - if( inside > 0 ){ - Vector pos = moving_object->get_pos(); - pos.y -= inside; - moving_object->set_pos( pos ); - } + WalkingBadguy* walking_badguy = dynamic_cast (&other); + //Trampoline also works for WalkingBadguy + if(walking_badguy) { + float vy = walking_badguy->get_velocity_y(); + //walking_badguy is falling down on trampoline + if(hit.top && vy >= 0) { + vy = VY_INITIAL; + walking_badguy->set_velocity_y(vy); + sound_manager->play(TRAMPOLINE_SOUND); + sprite->set_action("swinging", 1); + return FORCE_MOVE; } - CollisionHit hit_other = hit; - std::swap(hit_other.left, hit_other.right); - std::swap(hit_other.top, hit_other.bottom); - moving_object->collision_solid( hit_other ); + } } - return FORCE_MOVE; + + return Rock::collision(other, hit); } -void -Trampoline::collision_solid( const CollisionHit& hit ){ - if( hit.bottom ){ - on_ground = true; - } -} +void +Trampoline::collision_solid(const CollisionHit& hit) { + Rock::collision_solid(hit); +} void -Trampoline::grab( MovingObject&, const Vector& pos, Direction ){ - movement = pos - get_pos(); - set_group( COLGROUP_DISABLED ); - on_ground = true; - sprite->set_animation_loops( 0 ); +Trampoline::grab(MovingObject& object, const Vector& pos, Direction dir) { + sprite->set_animation_loops(0); + Rock::grab(object, pos, dir); } void -Trampoline::ungrab(MovingObject& , Direction ){ - set_group( COLGROUP_MOVING ); - on_ground = false; - physic.set_velocity(0, 0); +Trampoline::ungrab(MovingObject& object, Direction dir) { + Rock::ungrab(object, dir); } +bool +Trampoline::is_portable() const +{ + return Rock::is_portable() && portable; +} IMPLEMENT_FACTORY(Trampoline, "trampoline"); + +/* EOF */