X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fobject%2Fplatform.hpp;h=fa95ef864e2a84af454e555b9a9c863f9d527566;hb=81ccb660b3941050a6e723baeffe61f7a55f76ea;hp=06456a7b5d35c2e8fd638b4b2553b5add32e7005;hpb=a564bdaf72edefea95ad768330131a009f1be37d;p=supertux.git diff --git a/src/object/platform.hpp b/src/object/platform.hpp index 06456a7b5..fa95ef864 100644 --- a/src/object/platform.hpp +++ b/src/object/platform.hpp @@ -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,28 +12,24 @@ // 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 . -#ifndef __PLATFORM_H__ -#define __PLATFORM_H__ +#ifndef HEADER_SUPERTUX_OBJECT_PLATFORM_HPP +#define HEADER_SUPERTUX_OBJECT_PLATFORM_HPP -#include -#include #include "object/moving_sprite.hpp" -#include "object/path.hpp" #include "object/path_walker.hpp" -#include "script_interface.hpp" +#include "supertux/script_interface.hpp" /** * This class is the base class for platforms that tux can stand on */ -class Platform : public MovingSprite, public ScriptInterface +class Platform : public MovingSprite, + public ScriptInterface { public: - Platform(const lisp::Lisp& reader); + Platform(const Reader& reader); Platform(const Platform& platform); - virtual Platform* clone() const { return new Platform(*this); } virtual HitResponse collision(GameObject& other, const CollisionHit& hit); virtual void update(float elapsed_time); @@ -71,8 +65,8 @@ public: } private: - std::auto_ptr path; - std::auto_ptr walker; + std::unique_ptr path; + std::unique_ptr walker; Vector speed; @@ -83,3 +77,5 @@ private: }; #endif + +/* EOF */