Finished up code for basic functionality of earthflower powerup.

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

diff --git a/src/object/decal.cpp b/src/object/decal.cpp
index 62fec61..3a985a2 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,63 +12,28 @@
 //  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) :
+  MovingSprite(reader, LAYER_OBJECTS, COLGROUP_DISABLED)
 {
-  float px = 0;
-  float py = 0;
-  reader.get("x", px);
-  reader.get("y", py);
-  pos = Vector(px, py);
-
-  if(!reader.get("image", imagefile)) throw std::runtime_error("Must specify image for decal");
-  image.reset(new Surface(imagefile));
-
-  reader.get("layer", layer);
+  layer = reader_get_layer (reader, /* default = */ LAYER_OBJECTS);
+
+  bool solid = false;
+  reader.get("solid", solid);
+  if(solid)
+    set_group(COLGROUP_STATIC);
+  std::string action;
+  if(reader.get("action", action))
+    set_action(action, -1);
 }
 
 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)
-{
-}
-
-void
-Decal::draw(DrawingContext& context)
-{
-  if(!image.get()) return;
-  context.draw_surface(image.get(), pos, layer);
-}
-
-IMPLEMENT_FACTORY(Decal, "decal");
-
+/* EOF */