X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Fsprite_change.cpp;h=b4db66de75297d6fdb56ded742a7ae33cf957504;hb=850855bb178f8325762e7c9b1db94118cd48ad5c;hp=7eb044f09fef9e49be1542b44fb9d44075022faa;hpb=112f01454123c94f5627200c6819b219026f0af0;p=supertux.git

diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp
index 7eb044f09..b4db66de7 100644
--- a/src/worldmap/sprite_change.cpp
+++ b/src/worldmap/sprite_change.cpp
@@ -1,8 +1,7 @@
-//  $Id: worldmap.hpp 3327 2006-04-13 15:02:40Z ravu_al_hemio $
+//  $Id$
 //
 //  SuperTux
-//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
+//  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
@@ -22,16 +21,17 @@
 #include "sprite_change.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "sprite/sprite.hpp"
+#include "video/drawing_context.hpp"
 
 namespace WorldMapNS
 {
 
 SpriteChange::SpriteChange(const lisp::Lisp* lisp)
-  : enter(false), in_stay_action(false)
+  : change_on_touch(false), in_stay_action(false)
 {
   lisp->get("x", pos.x);
   lisp->get("y", pos.y);
-  lisp->get("enter", enter);
+  lisp->get("change-on-touch", change_on_touch);
   
   std::string spritefile = "";
   lisp->get("sprite", spritefile);
@@ -39,15 +39,24 @@ SpriteChange::SpriteChange(const lisp::Lisp* lisp)
 
   lisp->get("stay-action", stay_action);
   lisp->get("initial-stay-action", in_stay_action);
+
+  lisp->get("stay-group", stay_group);
+
+  all_sprite_changes.push_back(this);
 }
 
 SpriteChange::~SpriteChange()
 {
+  all_sprite_changes.remove(this);
 }
 
 void
-SpriteChange::draw(DrawingContext& )
+SpriteChange::draw(DrawingContext& context)
 {
+  if(in_stay_action && stay_action != "") {
+    sprite->set_action(stay_action);
+    sprite->draw(context, pos * 32, LAYER_OBJECTS-1);
+  }
 }
 
 void
@@ -55,4 +64,27 @@ SpriteChange::update(float )
 {
 }
 
+void
+SpriteChange::set_stay_action()
+{
+  in_stay_action = true;
+}
+
+void
+SpriteChange::clear_stay_action()
+{
+  in_stay_action = false;
+
+  // if we are in a stay_group, also clear all stay actions in this group
+  if (stay_group != "") {
+    for (std::list<SpriteChange*>::iterator i = all_sprite_changes.begin(); i != all_sprite_changes.end(); i++) {
+      SpriteChange* sc = *i;
+      if (sc->stay_group != stay_group) continue;
+      sc->in_stay_action = false;
+    }
+  }
+}
+
+std::list<SpriteChange*> SpriteChange::all_sprite_changes;
+
 }