X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.h;h=9795a6062961b283d7efcb1e38fe1a2b8756538a;hb=7c43158af1abf38fa896a442cb3c6d8a5bc630e7;hp=b12efaedebb35fe3fac09057ffb13600aa3348ff;hpb=02db07fbdd774a0a3b10806aa77d782059ba62cc;p=l2e.git

diff --git a/src/loader/Interpreter.h b/src/loader/Interpreter.h
index b12efae..9795a60 100644
--- a/src/loader/Interpreter.h
+++ b/src/loader/Interpreter.h
@@ -8,11 +8,16 @@
 #ifndef LOADER_INTERPRETER_H_
 #define LOADER_INTERPRETER_H_
 
+#include "fwd.h"
+#include "PagedAllocator.h"
 #include "ParsedSource.h"
 #include "TypeDescription.h"
+#include "../battle/fwd.h"
+#include "../common/fwd.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Color.h"
 #include "../graphics/ComplexAnimation.h"
+#include "../graphics/fwd.h"
 
 #include <map>
 #include <set>
@@ -21,38 +26,8 @@
 #include <vector>
 #include <SDL.h>
 
-namespace battle {
-	class Hero;
-	class Monster;
-	class PartyLayout;
-	struct Resources;
-	class Stats;
-}
-
-namespace common {
-	class Ikari;
-	class Item;
-	class Spell;
-	class TargetingMode;
-}
-
-namespace graphics {
-	class Animation;
-	class Font;
-	class Frame;
-	class Gauge;
-	struct MenuProperties;
-	class SimpleAnimation;
-	class Sprite;
-}
-
 namespace loader {
 
-class Definition;
-class Literal;
-class PropertyList;
-class Value;
-
 class Interpreter {
 
 public:
@@ -62,7 +37,7 @@ public:
 	};
 
 public:
-	Interpreter(const ParsedSource &source) : source(source) { }
+	explicit Interpreter(const ParsedSource &source) : source(source), alloc(4096) { }
 	~Interpreter();
 private:
 	Interpreter(const Interpreter &);
@@ -92,7 +67,7 @@ public:
 	};
 
 	const std::set<std::string> &ExportedIdentifiers() const { return source.Exports(); }
-	const ParsedDefinition &GetDefinition(const std::string &identifier) const { return parsedDefinitions.at(identifier); }
+	const ParsedDefinition &GetDefinition(const std::string &identifier);
 	const std::map<std::string, SDL_Surface *> &Images() const { return imageCache; }
 	const std::vector<PostponedDefinition> &PostponedDefinitions() const { return postponedDefinitions; }
 	const std::map<int, std::vector<void *> > &Values() const { return values; }
@@ -105,6 +80,11 @@ private:
 	void ReadLiteral(int typeId, int id, char *dest, const Literal &);
 	void *GetObject(int typeId, const Value &value);
 	void ReadObject(int typeId, int id, char *dest, const PropertyList &);
+	void ReadScript(const std::vector<ScriptToken *> &, common::Script *);
+	char *ReadScript(const std::vector<ScriptToken *> &);
+	void ReadScriptAddress(const ScriptToken &t, unsigned char *dest);
+	void ReadScriptInteger(const ScriptToken &t, unsigned char *dest);
+	void ReadScriptVector(const ScriptToken &t, unsigned char *dest);
 
 	SDL_Surface *GetImage(const std::string &);
 
@@ -114,6 +94,8 @@ private:
 private:
 	const ParsedSource &source;
 
+	PagedAllocator alloc;
+
 	std::map<std::string, ParsedDefinition> parsedDefinitions;
 	std::vector<PostponedDefinition> postponedDefinitions;
 	std::map<std::string, SDL_Surface *> imageCache;