X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fmoving_sprite.cpp;h=24f0877b4c0337da2ef3a0c860e608dc298ca551;hb=c1277f5b7db9f55d1d28f658b4e804f32b76f0ce;hp=a737109d0533572b00844319237fab018a96d53b;hpb=84abfaeb33c5bf8dac0cfd9499d9d4c3e7d39881;p=supertux.git diff --git a/src/object/moving_sprite.cpp b/src/object/moving_sprite.cpp index a737109d0..24f0877b4 100644 --- a/src/object/moving_sprite.cpp +++ b/src/object/moving_sprite.cpp @@ -18,8 +18,11 @@ #include "sprite/sprite.hpp" #include "sprite/sprite_manager.hpp" -MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name, int layer, CollisionGroup collision_group) - : sprite_name(sprite_name), layer(layer) +MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name, + int layer, CollisionGroup collision_group) : + sprite_name(sprite_name), + sprite(), + layer(layer) { bbox.set_pos(pos); sprite = sprite_manager->create(sprite_name); @@ -27,8 +30,10 @@ MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name, in set_group(collision_group); } -MovingSprite::MovingSprite(const Reader& reader, const Vector& pos, int layer, CollisionGroup collision_group) - : layer(layer) +MovingSprite::MovingSprite(const Reader& reader, const Vector& pos, int layer, CollisionGroup collision_group) : + sprite_name(sprite_name), + sprite(), + layer(layer) { bbox.set_pos(pos); if (!reader.get("sprite", sprite_name)) @@ -39,8 +44,10 @@ MovingSprite::MovingSprite(const Reader& reader, const Vector& pos, int layer, C set_group(collision_group); } -MovingSprite::MovingSprite(const Reader& reader, const std::string& sprite_name, int layer, CollisionGroup collision_group) - : sprite_name(sprite_name), layer(layer) +MovingSprite::MovingSprite(const Reader& reader, const std::string& sprite_name, int layer, CollisionGroup collision_group) : + sprite_name(sprite_name), + sprite(), + layer(layer) { reader.get("x", bbox.p1.x); reader.get("y", bbox.p1.y); @@ -51,8 +58,10 @@ MovingSprite::MovingSprite(const Reader& reader, const std::string& sprite_name, set_group(collision_group); } -MovingSprite::MovingSprite(const Reader& reader, int layer, CollisionGroup collision_group) - : layer(layer) +MovingSprite::MovingSprite(const Reader& reader, int layer, CollisionGroup collision_group) : + sprite_name(), + sprite(), + layer(layer) { reader.get("x", bbox.p1.x); reader.get("y", bbox.p1.y); @@ -66,6 +75,8 @@ MovingSprite::MovingSprite(const Reader& reader, int layer, CollisionGroup colli MovingSprite::MovingSprite(const MovingSprite& other) : MovingObject(other), + sprite_name(), + sprite(), layer(other.layer) { sprite.reset(new Sprite(*other.sprite));