X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Fsprite_change.cpp;h=48c425ae2d9c4c1106b093d0d0fd9029402865b4;hb=24fc5a4c6959f07a6925dd2ab1af3da7fd982007;hp=ef32fb251e49529e29590f8074609c40e2edc088;hpb=087de4c9139b8f91b0d863468cde5ce4b9e2c133;p=supertux.git

diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp
index ef32fb251..48c425ae2 100644
--- a/src/worldmap/sprite_change.cpp
+++ b/src/worldmap/sprite_change.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.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,33 +12,37 @@
 //  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 <http://www.gnu.org/licenses/>.
 #include <config.h>
 
-#include "sprite_change.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
+#include "worldmap/sprite_change.hpp"
 
-namespace WorldMapNS
-{
+namespace WorldMapNS {
 
-SpriteChange::SpriteChange(const lisp::Lisp* lisp)
-  : change_on_touch(false), in_stay_action(false)
+SpriteChange::SpriteChange(const Reader& lisp) :
+  pos(),
+  change_on_touch(false), 
+  sprite(),
+  stay_action(),
+  stay_group(),
+  in_stay_action(false)
 {
-  lisp->get("x", pos.x);
-  lisp->get("y", pos.y);
-  lisp->get("change-on-touch", change_on_touch);
-  
+  lisp.get("x", pos.x);
+  lisp.get("y", pos.y);
+  lisp.get("change-on-touch", change_on_touch);
+
   std::string spritefile = "";
-  lisp->get("sprite", spritefile);
-  sprite.reset(sprite_manager->create(spritefile));
+  lisp.get("sprite", spritefile);
+  sprite = sprite_manager->create(spritefile);
 
-  lisp->get("stay-action", stay_action);
-  lisp->get("initial-stay-action", in_stay_action);
+  lisp.get("stay-action", stay_action);
+  lisp.get("initial-stay-action", in_stay_action);
 
-  lisp->get("stay-group", stay_group);
+  lisp.get("stay-group", stay_group);
 
   all_sprite_changes.push_back(this);
 }
@@ -55,7 +57,7 @@ SpriteChange::draw(DrawingContext& context)
 {
   if(in_stay_action && stay_action != "") {
     sprite->set_action(stay_action);
-    sprite->draw(context, pos * 32 + Vector(16, 16), LAYER_OBJECTS-1);
+    sprite->draw(context, pos * 32, LAYER_OBJECTS-1);
   }
 }
 
@@ -88,3 +90,5 @@ SpriteChange::clear_stay_action()
 std::list<SpriteChange*> SpriteChange::all_sprite_changes;
 
 }
+
+/* EOF */