X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Floader%2FInterpreter.h;h=da0cb88de147c2725a6d846bf9782d76f69ca77f;hb=5e09448d2b941226aff51e9c8759327a8e1ade14;hp=aea5fbe85712433c963cf5f1aeb8016f59fdbc0b;hpb=912fc1a30dc8ec2ab782256d32e517206c87a04c;p=l2e.git

diff --git a/src/loader/Interpreter.h b/src/loader/Interpreter.h
index aea5fbe..da0cb88 100644
--- a/src/loader/Interpreter.h
+++ b/src/loader/Interpreter.h
@@ -87,8 +87,7 @@ private:
 
 private:
 	const ParsedSource &source;
-	enum DynamicType {
-		ANIMATION,
+	enum Type {
 		COMPLEX_ANIMATION,
 		HERO,
 		MONSTER,
@@ -97,20 +96,20 @@ private:
 		SPRITE,
 	};
 	struct ParsedDefinition {
-		ParsedDefinition(const Definition *dfn, DynamicType type, int index)
+		ParsedDefinition(const Definition *dfn, Type type, int index)
 		: dfn(dfn), type(type), index(index) { }
-		bool IsCompatible(DynamicType with) const;
 		const Definition *dfn;
-		DynamicType type;
+		Type type;
 		int index;
 	};
 	std::map<std::string, ParsedDefinition> parsedDefinitions;
 
-	std::vector<graphics::Animation *> animations;
+	std::vector<graphics::ComplexAnimation *> complexAnimations;
 	std::vector<battle::Hero *> heroes;
 	std::vector<SDL_Surface *> images;
 	std::vector<battle::Monster *> monsters;
 	std::vector<int> numbers;
+	std::vector<graphics::SimpleAnimation *> simpleAnimations;
 	std::vector<graphics::Sprite *> sprites;
 
 };