X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FEntity.h;h=926c360fef144d740c4cc7f460372aadb3644b87;hb=f0da7a839b18b9860fad1c62f36003628f84b5b3;hp=2bc6aac6a863913eaece225598bf8ed85e5cd969;hpb=1d6a9f01b8db0f5212b6a02603dd0670c6da38c7;p=l2e.git

diff --git a/src/map/Entity.h b/src/map/Entity.h
index 2bc6aac..926c360 100644
--- a/src/map/Entity.h
+++ b/src/map/Entity.h
@@ -38,11 +38,14 @@ public:
 	geometry::Vector<float> &Velocity() { return velocity; }
 	const geometry::Vector<float> &Velocity() const { return velocity; }
 
-	void SetSprite(const graphics::Sprite *s) { sprite = s; }
-	graphics::AnimationRunner &Animation() { return animation; }
-	const graphics::AnimationRunner &Animation() const { return animation; }
+	void SetAnimation(const graphics::Animation *a);
+	void StartAnimation(app::Application &ctrl) { runner.Start(ctrl); }
+	void StartAnimation(app::State &ctrl) { runner.Start(ctrl); }
+	void StopAnimation() { runner.Stop(); }
+	bool AnimationRunning() const { return runner.Running(); }
 
 	void SetOrientation(Orientation);
+	Orientation GetOrientation() const { return orientation; }
 	void SetSpeed(float);
 
 	bool TileLock(int width, int height) const;
@@ -55,8 +58,8 @@ private:
 	void UpdateVelocity();
 
 private:
-	const graphics::Sprite *sprite;
-	graphics::AnimationRunner animation;
+	const graphics::Animation *animation;
+	graphics::AnimationRunner runner;
 	geometry::Vector<float> position;
 	geometry::Vector<float> velocity;
 	Orientation orientation;