X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fmoving_sprite.cpp;h=646addbd1882eb150c5d683c7feaa4fe6dc1a134;hb=53209e9747f4c830eeeb926d3a44918ed86621ba;hp=a737109d0533572b00844319237fab018a96d53b;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git diff --git a/src/object/moving_sprite.cpp b/src/object/moving_sprite.cpp index a737109d0..646addbd1 100644 --- a/src/object/moving_sprite.cpp +++ b/src/object/moving_sprite.cpp @@ -17,9 +17,13 @@ #include "object/moving_sprite.hpp" #include "sprite/sprite.hpp" #include "sprite/sprite_manager.hpp" +#include "util/reader.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 +31,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 +45,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 +59,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 +76,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));