X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fgrowup.cpp;h=d460feb451b1273dcfbff32cb6aabd794c2b2618;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=d422c2a10c8a4a775bd5098d4d91c4f7a285f082;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git diff --git a/src/object/growup.cpp b/src/object/growup.cpp index d422c2a10..d460feb45 100644 --- a/src/object/growup.cpp +++ b/src/object/growup.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // Copyright (C) 2006 Matthias Braun // -// 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,21 +12,14 @@ // 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. - -#include +// along with this program. If not, see . -#include -#include "growup.hpp" -#include "resources.hpp" -#include "camera.hpp" -#include "sector.hpp" -#include "player.hpp" #include "audio/sound_manager.hpp" +#include "object/growup.hpp" +#include "object/player.hpp" -GrowUp::GrowUp(Direction direction) - : MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING) +GrowUp::GrowUp(Direction direction) : + MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING) { physic.enable_gravity(true); physic.set_velocity_x((direction == LEFT)?-100:100); @@ -75,5 +66,7 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit ) void GrowUp::do_jump() { - physic.set_velocity_y(-300); + physic.set_velocity_y(-300); } + +/* EOF */