Don't die when main icon cannot be loaded

[supertux.git] / src / object / moving_sprite.cpp

diff --git a/src/object/moving_sprite.cpp b/src/object/moving_sprite.cpp
index aad264a..56cf420 100644 (file)
--- a/src/object/moving_sprite.cpp
+++ b/src/object/moving_sprite.cpp
@@ -36,7 +36,7 @@
 #include "timer.hpp"
 
 MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name, int layer, CollisionGroup collision_group)
-       : sprite_name(sprite_name), layer(layer)
+        : sprite_name(sprite_name), layer(layer)
 {
   bbox.set_pos(pos);
   sprite = sprite_manager->create(sprite_name);
@@ -45,7 +45,7 @@ MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name, in
 }
 
 MovingSprite::MovingSprite(const lisp::Lisp& reader, const Vector& pos, int layer, CollisionGroup collision_group)
-       : layer(layer)
+        : layer(layer)
 {
   bbox.set_pos(pos);
   if (!reader.get("sprite", sprite_name))
@@ -57,7 +57,7 @@ MovingSprite::MovingSprite(const lisp::Lisp& reader, const Vector& pos, int laye
 }
 
 MovingSprite::MovingSprite(const lisp::Lisp& reader, const std::string& sprite_name, int layer, CollisionGroup collision_group)
-       : sprite_name(sprite_name), layer(layer)
+        : sprite_name(sprite_name), layer(layer)
 {
   if (!reader.get("x", bbox.p1.x))
     throw std::runtime_error("no x position set");
@@ -70,7 +70,7 @@ MovingSprite::MovingSprite(const lisp::Lisp& reader, const std::string& sprite_n
 }
 
 MovingSprite::MovingSprite(const lisp::Lisp& reader, int layer, CollisionGroup collision_group)
-       : layer(layer)
+        : layer(layer)
 {
   if (!reader.get("x", bbox.p1.x))
     throw std::runtime_error("no x position set");
@@ -85,7 +85,7 @@ MovingSprite::MovingSprite(const lisp::Lisp& reader, int layer, CollisionGroup c
 }
 
 MovingSprite::MovingSprite(const MovingSprite& other)
-       : MovingObject(other), layer(other.layer)
+        : MovingObject(other), layer(other.layer)
 {
   sprite = new Sprite(*other.sprite);
 }
@@ -135,3 +135,14 @@ MovingSprite::set_action_centered(const std::string& action, int loops)
   set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
   set_pos(get_pos() - (bbox.get_size() - old_size) / 2);
 }
+
+void
+MovingSprite::set_action(const std::string& action, int loops, AnchorPoint anchorPoint)
+{
+  Rect old_bbox = bbox;
+  sprite->set_action(action, loops);
+  float w = sprite->get_current_hitbox_width();
+  float h = sprite->get_current_hitbox_height();
+  set_size(w, h);
+  set_pos(get_anchor_pos(old_bbox, w, h, anchorPoint));
+}