X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FAnimation.h;h=cfdb14639b2468f9267de38ea3f74fbac431cc6c;hb=c03b01f2a152927227a674d462794604aa08e5dd;hp=e26bca9c2cc889b9c39ef466442394dfa798d04c;hpb=0542849dfccfec1ce1477265fa0fee2401a8fb23;p=l2e.git

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index e26bca9..cfdb146 100644
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -12,8 +12,10 @@
 #include "../app/Application.h"
 #include "../app/State.h"
 #include "../app/Timer.h"
+#include "../loader/fwd.h"
 #include "../geometry/Vector.h"
 
+#include <memory>
 #include <SDL.h>
 
 namespace graphics {
@@ -28,17 +30,24 @@ public:
 	virtual ~Animation() { };
 
 public:
-
 	const Sprite *GetSprite() const { return sprite; }
 	int FrameTime() const { return frameTime; }
 	bool Repeat() const { return repeat; }
 
+public:
+	void SetSprite(const Sprite *s) { sprite = s; }
+	void SetFrameTime(int t) { frameTime = t; }
+	void SetRepeat(bool r) { repeat = r; }
+
 public:
 	virtual int NumFrames() const = 0;
 	virtual int Col(int frame) const = 0;
 	virtual int Row(int frame) const = 0;
 	virtual geometry::Vector<int> Offset(int frame) const { return geometry::Vector<int>(); }
 
+protected:
+	static void AddFields(loader::TypeDescription &, const Animation &, std::ptrdiff_t offset, int boolId, int numberId, int spriteId);
+
 private:
 	const Sprite *sprite;
 	int frameTime;
@@ -97,8 +106,7 @@ public:
 		Draw(dest, position + offset);
 	}
 	void DrawCenter(SDL_Surface *dest, geometry::Vector<int> position) const {
-		geometry::Vector<int> offset(-sprite->Width() / 2, -sprite->Height() / 2);
-		Draw(dest, position + offset);
+		Draw(dest, position - (sprite->Size() / 2));
 	}
 	void DrawCenterBottom(SDL_Surface *dest, geometry::Vector<int> position) const {
 		geometry::Vector<int> offset(-sprite->Width() / 2, -sprite->Height());