X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fdecal.hpp;h=1ea673ae27208eda04b59e645e533ee75958d26d;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=b29148de2cf894491b7d6008f8e170390a31a6a5;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git diff --git a/src/object/decal.hpp b/src/object/decal.hpp index b29148de2..1ea673ae2 100644 --- a/src/object/decal.hpp +++ b/src/object/decal.hpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux - Decal // Copyright (C) 2008 Christoph Sommer // -// 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,34 +12,26 @@ // 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 SUPERTUX_DECAL_H -#define SUPERTUX_DECAL_H +#ifndef HEADER_SUPERTUX_OBJECT_DECAL_HPP +#define HEADER_SUPERTUX_OBJECT_DECAL_HPP -#include -#include "video/surface.hpp" +#include "supertux/game_object.hpp" +#include "util/reader_fwd.hpp" #include "video/drawing_context.hpp" -#include "game_object.hpp" -#include "serializable.hpp" class DisplayManager; -namespace lisp { -class Lisp; -} - /** * Non-interactive, decorative image */ -class Decal : public GameObject, public Serializable +class Decal : public GameObject { public: - Decal(const lisp::Lisp& reader); + Decal(const Reader& reader); virtual ~Decal(); - virtual void write(lisp::Writer& writer); virtual void update(float elapsed_time); virtual void draw(DrawingContext& context); @@ -55,3 +45,4 @@ private: #endif /*SUPERTUX_DECAL_H*/ +/* EOF */