Prevent livefire from wakeing from sleep while in the process of being extinguished

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

diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp
index 932eb16..fa8e0ef 100644 (file)
--- a/src/badguy/mriceblock.cpp
+++ b/src/badguy/mriceblock.cpp
@@ -19,6 +19,7 @@
 #include "audio/sound_manager.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
 #include "supertux/object_factory.hpp"
 
 #include <math.h>
@@ -230,6 +231,7 @@ MrIceBlock::set_state(IceState state, bool up)
 
   switch(state) {
     case ICESTATE_NORMAL:
+      this->set_action(dir == LEFT ? "left" : "right", /* loops = */ -1);
       WalkingBadguy::initialize();
       break;
     case ICESTATE_FLAT:
@@ -288,4 +290,11 @@ MrIceBlock::is_portable() const
   return ice_state == ICESTATE_FLAT;
 }
 
+SmartBlock::SmartBlock(const Reader& reader) :
+  MrIceBlock(reader)
+{
+  max_drop_height = 16;
+  sprite = sprite_manager->create("images/creatures/mr_iceblock/smart_block/smart_block.sprite");
+}
+
 /* EOF */