X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Froot.cpp;h=6fa949e202039bd907bab5c65da82476e987a78d;hb=9598330d85ae6dae2ced6f7542b642288f094728;hp=4b94051fd5728d3c5ef73979ee7166d495a724c6;hpb=ecd50c335ca7dd467d97bdb6f234fda6681e43ee;p=supertux.git

diff --git a/src/badguy/root.cpp b/src/badguy/root.cpp
index 4b94051fd..6fa949e20 100644
--- a/src/badguy/root.cpp
+++ b/src/badguy/root.cpp
@@ -20,14 +20,19 @@
 #include <config.h>
 
 #include "root.hpp"
+#include "sprite/sprite_manager.hpp"
 
-static const float SPEED = 5;
+static const float SPEED_GROW = 256;
+static const float SPEED_SHRINK = 128;
 
 Root::Root(const Vector& pos)
-  : BadGuy(pos, "images/creatures/ghosttree/root.sprite", LAYER_OBJECTS+20),
-    ypos(0), speed(-SPEED)
+  : BadGuy(pos, "images/creatures/ghosttree/root.sprite", LAYER_TILES-1),
+    mystate(STATE_APPEARING), offset_y(0)
 {
-  //ypos = sprite->get_height();
+  base_sprite.reset(sprite_manager->create("images/creatures/ghosttree/root-base.sprite"));
+  base_sprite->set_action("appearing", 1);
+  base_sprite->set_animation_loops(1); // TODO: necessary because set_action ignores loops for default action
+  physic.enable_gravity(false);
 }
 
 Root::~Root()
@@ -37,20 +42,49 @@ Root::~Root()
 void
 Root::activate()
 {
-  set_pos(start_position + Vector(0, ypos));
+  set_group(COLGROUP_TOUCHABLE);
+}
+
+void
+Root::deactivate()
+{
+  remove_me(); 
 }
 
 void
 Root::active_update(float elapsed_time)
 {
-  ypos += elapsed_time * speed;
-  if(ypos < 0) {
-    ypos = 0;
-    speed = -speed;
+  if (mystate == STATE_APPEARING) {  
+    if (base_sprite->animation_done()) mystate = STATE_GROWING;
+  }
+  else if (mystate == STATE_GROWING) {
+    offset_y -= elapsed_time * SPEED_GROW;
+    if (offset_y < -sprite->get_height()) {
+      offset_y = -sprite->get_height();
+      mystate = STATE_SHRINKING;
+    }
+    set_pos(start_position + Vector(0, offset_y));
   }
-  if(speed > 0 && ypos > sprite->get_height()) {
-    remove_me();
+  else if (mystate == STATE_SHRINKING) {
+    offset_y += elapsed_time * SPEED_SHRINK;
+    if (offset_y > 0) {
+      offset_y = 0;
+      mystate = STATE_VANISHING;
+      base_sprite->set_action("vanishing", 2);
+      base_sprite->set_animation_loops(2); // TODO: doesn't seem to work for loops=1 
+    }
+    set_pos(start_position + Vector(0, offset_y));
   }
-  set_pos(start_position + Vector(0, ypos));
+  else if (mystate == STATE_VANISHING) {
+    if (base_sprite->animation_done()) remove_me();
+  }
+  BadGuy::active_update(elapsed_time);
+}
+
+void
+Root::draw(DrawingContext& context)
+{
+  base_sprite->draw(context, start_position, LAYER_TILES+1);
+  if ((mystate != STATE_APPEARING) && (mystate != STATE_VANISHING)) BadGuy::draw(context);
 }