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

diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp
index 7eb044f09..18c10cf41 100644
--- a/src/worldmap/sprite_change.cpp
+++ b/src/worldmap/sprite_change.cpp
@@ -1,13 +1,10 @@
-//  $Id: worldmap.hpp 3327 2006-04-13 15:02:40Z ravu_al_hemio $
-//
 //  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
-//  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
@@ -15,39 +12,52 @@
 //  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 "video/drawing_context.hpp"
+#include "worldmap/sprite_change.hpp"
 
-namespace WorldMapNS
-{
+namespace WorldMapNS {
 
-SpriteChange::SpriteChange(const lisp::Lisp* lisp)
-  : enter(false), in_stay_action(false)
+SpriteChange::SpriteChange(const lisp::Lisp* 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("enter", enter);
-  
+  lisp->get("change-on-touch", change_on_touch);
+
   std::string spritefile = "";
   lisp->get("sprite", spritefile);
-  sprite.reset(sprite_manager->create(spritefile));
+  sprite = sprite_manager->create(spritefile);
 
   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 +65,29 @@ 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;
+
+}
+
+/* EOF */