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

diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp
index 9ac536ecd..b4db66de7 100644
--- a/src/worldmap/sprite_change.cpp
+++ b/src/worldmap/sprite_change.cpp
@@ -39,10 +39,15 @@ 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
@@ -50,7 +55,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);
   }
 }
 
@@ -59,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;
+
 }