Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / object / decal.cpp

diff --git a/src/object/decal.cpp b/src/object/decal.cpp
index 62fec61..a22d8db 100644 (file)
--- a/src/object/decal.cpp
+++ b/src/object/decal.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Decal
 //  Copyright (C) 2008 Christoph Sommer <christoph.sommer@2008.expires.deltadevelopment.de>
 //
-//  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,24 +12,17 @@
 //  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 <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <stdexcept>
-#include "decal.hpp"
-#include "camera.hpp"
-#include "video/drawing_context.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
-#include "object_factory.hpp"
-#include "resources.hpp"
-#include "main.hpp"
-#include "log.hpp"
+#include "object/decal.hpp"
+#include "supertux/object_factory.hpp"
+#include "util/reader.hpp"
 
-Decal::Decal(const lisp::Lisp& reader)
-  : layer(LAYER_OBJECTS)
+Decal::Decal(const Reader& reader) :
+  pos(),
+  imagefile(),
+  layer(LAYER_OBJECTS),
+  image()
 {
   float px = 0;
   float py = 0;
@@ -50,17 +41,6 @@ Decal::~Decal()
 }
 
 void
-Decal::write(lisp::Writer& writer)
-{
-  writer.start_list("decal");
-  writer.write("x", pos.x);
-  writer.write("y", pos.y);
-  writer.write("image", imagefile);
-  writer.write("layer", layer);
-  writer.end_list("decal");
-}
-
-void
 Decal::update(float)
 {
 }
@@ -74,3 +54,4 @@ Decal::draw(DrawingContext& context)
 
 IMPLEMENT_FACTORY(Decal, "decal");
 
+/* EOF */