From: LMH <lmh.0013@gmail.com>
Date: Mon, 2 Sep 2013 18:29:15 +0000 (-1000)
Subject: Improved death mechanics of livefire
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ac0af7757398d7acaf46e9be43c89ef6d7a497b4;p=supertux.git

Improved death mechanics of livefire
---

diff --git a/data/images/creatures/livefire/livefire.sprite b/data/images/creatures/livefire/livefire.sprite
index 0124307e8..42deb7537 100644
--- a/data/images/creatures/livefire/livefire.sprite
+++ b/data/images/creatures/livefire/livefire.sprite
@@ -44,15 +44,7 @@
    "extinguish-left-3.png"
    "extinguish-left-4.png"
    "extinguish-left-5.png"
-   "extinguish-left-4.png"
-   "extinguish-left-5.png"
-   "extinguish-left-5.png"
-   "extinguish-left-5.png"
-   "extinguish-left-5.png"
-   "extinguish-left-5.png"
-   "extinguish-left-5.png"
-   "extinguish-left-5.png"
-   "extinguish-left-5.png"))
+   "extinguish-left-4.png"))
  (action
   (name "extinguish-right")
   (fps 6.0)
diff --git a/src/badguy/livefire.cpp b/src/badguy/livefire.cpp
index 955fad06b..b627c4934 100644
--- a/src/badguy/livefire.cpp
+++ b/src/badguy/livefire.cpp
@@ -59,6 +59,10 @@ LiveFire::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
 void
 LiveFire::active_update(float elapsed_time) {
 
+  // Remove when extinguish animation is done
+  if((sprite->get_action() == "extinguish-left" || sprite->get_action() == "extinguish-right" )
+    && sprite->animation_done()) remove_me();
+
   if(state == STATE_WALKING) {
     WalkingBadguy::active_update(elapsed_time);
     return;
@@ -139,11 +143,13 @@ LiveFire::kill_fall()
   Vector paccel = Vector(0,0);
   Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_BACKGROUNDTILES+2));
   // extinguish the flame
-  sprite->set_action(dir == LEFT ? "extinguish-left" : "extinguish-right");
+  sprite->set_action(dir == LEFT ? "extinguish-left" : "extinguish-right", 1);
   physic.set_velocity_y(0);
   physic.set_acceleration_y(0);
   physic.enable_gravity(false);
-  set_state(STATE_SQUISHED); // used to nullify any threat and remove
+  lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+  lightsprite->set_color(Color(0.5f, 0.4f, 0.3f));
+  set_group(COLGROUP_DISABLED);
 
   // start dead-script
   run_dead_script();