Haywire not moving when jumping on it after freezing

[supertux.git] / src / badguy / iceflame.cpp

diff --git a/src/badguy/iceflame.cpp b/src/badguy/iceflame.cpp
index 1ab9b16..7160036 100644 (file)
--- a/src/badguy/iceflame.cpp
+++ b/src/badguy/iceflame.cpp
@@ -1,5 +1,5 @@
-//  SuperTux
-//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//  SuperTux badguy - Iceflame a flame-like enemy that can be killed with fireballs
+//  Copyright (C) 2013 LMH <lmh.0013@gmail.com>
 //
 //  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
@@ -32,7 +32,6 @@ Iceflame::Iceflame(const Reader& reader) :
   angle(0), 
   radius(100), 
   speed(2),
-  fading(false),
   light(0.0f,0.0f,0.0f),
   lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
 {
@@ -41,8 +40,7 @@ Iceflame::Iceflame(const Reader& reader) :
   bbox.set_pos(Vector(start_position.x + cos(angle) * radius,
                       start_position.y + sin(angle) * radius));
   countMe = false;
-  //TODO: get unique death sound
-  sound_manager->preload("sounds/fizz.wav");
+  sound_manager->preload("sounds/sizzle.ogg");
   
   set_colgroup_active(COLGROUP_TOUCHABLE);
   
@@ -59,8 +57,7 @@ Iceflame::active_update(float elapsed_time)
                 start_position.y + sin(angle) * radius);
   movement = newpos - get_pos();
   
-  if(fading)
-    if (sprite->animation_done()) remove_me();
+  if (sprite->get_action() == "fade" && sprite->animation_done()) remove_me();
 }
 
 void
@@ -89,14 +86,11 @@ Iceflame::kill_fall()
 void
 Iceflame::ignite()
 {
-  sound_manager->play("sounds/fizz.wav", get_pos());
+  sound_manager->play("sounds/sizzle.ogg", get_pos());
   sprite->set_action("fade", 1);
-  Vector ppos = bbox.get_middle();
-  Vector pspeed = Vector(0, -150);
-  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));
-  fading = true;
-  
+  Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", "default", bbox.get_middle(), ANCHOR_MIDDLE, Vector(0, -150), Vector(0,0), LAYER_BACKGROUNDTILES+2));
+  set_group(COLGROUP_DISABLED);
+
   // start dead-script
   run_dead_script();
 }