X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fspecialriser.cpp;h=d9e8f09d2b510ca00e57c69315a0dea909283167;hb=d097f456b8ab4f42058545bdd4f8f676d151e974;hp=60c7861e029d043254ad5ebad18528d3940e9222;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/object/specialriser.cpp b/src/object/specialriser.cpp index 60c7861e0..d9e8f09d2 100644 --- a/src/object/specialriser.cpp +++ b/src/object/specialriser.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,20 +12,15 @@ // 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 "specialriser.hpp" -#include "resources.hpp" -#include "camera.hpp" -#include "sector.hpp" -#include "sprite/sprite_manager.hpp" +#include "video/drawing_context.hpp" +#include "object/specialriser.hpp" +#include "supertux/sector.hpp" -SpecialRiser::SpecialRiser(Vector pos, MovingObject* _child) - : child(_child) +SpecialRiser::SpecialRiser(Vector pos, std::shared_ptr _child) : + offset(), + child(_child) { _child->set_pos(pos - Vector(0, 32)); offset = 0; @@ -52,7 +45,9 @@ SpecialRiser::draw(DrawingContext& context) { context.push_transform(); context.set_translation( - context.get_translation() + Vector(0, -32 + offset)); + context.get_translation() + Vector(0, -32 + offset)); child->draw(context); context.pop_transform(); } + +/* EOF */