diff --git a/source/World.cpp b/source/World.cpp index c9db57c..8eb0147 100755 --- a/source/World.cpp +++ b/source/World.cpp @@ -236,7 +236,7 @@ World::step(int elapsed) { it--; } // Apply movement for movable sprites. - else if ((*it)->isMovable()) { + else if ((*it)->getSpeed() != sf::Vector2f()) { sf::Vector2f speed = spriteA->getSpeed(); speed *= elapsed / 1000.0f; bool overlap = false; diff --git a/source/abstract/Sprite.cpp b/source/abstract/Sprite.cpp index d4d5d2e..1e72122 100755 --- a/source/abstract/Sprite.cpp +++ b/source/abstract/Sprite.cpp @@ -149,15 +149,6 @@ Sprite::collisionEnabled(Category category) const { return (category & mMask) != 0; } -/** - * Returns true if this sprite is able to move, currently decided by shape - * (circle can move, rectangle can not). - */ -bool -Sprite::isMovable() const { - return mShape.type == Shape::Type::CIRCLE; -} - /** * Called when a collision with another Sprite occured. Override this method * to manage collision events. diff --git a/source/abstract/Sprite.h b/source/abstract/Sprite.h index e6b5b7b..0a50ea5 100755 --- a/source/abstract/Sprite.h +++ b/source/abstract/Sprite.h @@ -66,7 +66,6 @@ public: sf::Vector2f getSize() const; virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const; bool collisionEnabled(Category category) const; - bool isMovable() const; virtual void onCollide(std::shared_ptr other);