X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.h;h=7755a1beb01e767684f5db5561143b48661b4cca;hb=03dabc4ea94ac00e73c4a61260eaeb7f4a0973fe;hp=93a6e36227b576cc95744a80b4eb9522885e8a10;hpb=27c650023e0fb9e5549caeff0989faccd564b9cb;p=l2e.git

diff --git a/src/loader/Interpreter.h b/src/loader/Interpreter.h
index 93a6e36..7755a1b 100644
--- a/src/loader/Interpreter.h
+++ b/src/loader/Interpreter.h
@@ -25,6 +25,8 @@ namespace battle {
 }
 
 namespace common {
+	class Ikari;
+	class Item;
 	class Spell;
 	class TargetingMode;
 }
@@ -70,9 +72,12 @@ public:
 	graphics::Frame *GetFrame(const std::string &name);
 	graphics::Gauge *GetGauge(const std::string &name);
 	battle::Hero *GetHero(const std::string &name);
+	common::Ikari *GetIkari(const std::string &name);
+	common::Item *GetItem(const std::string &name);
 	battle::Monster *GetMonster(const std::string &name);
 	int GetNumber(const std::string &name) const;
 	battle::PartyLayout *GetPartyLayout(const std::string &name);
+	const char *GetPath(const std::string &name) const;
 	common::Spell *GetSpell(const std::string &name);
 	graphics::Sprite *GetSprite(const std::string &name);
 	const char *GetString(const std::string &name) const;
@@ -86,7 +91,9 @@ public:
 	const std::vector<graphics::Frame *> &Frames() const { return frames; }
 	const std::vector<graphics::Gauge *> &Gauges() const { return gauges; }
 	const std::vector<battle::Hero *> &Heroes() const { return heroes; }
+	const std::vector<common::Ikari *> &Ikaris() const { return ikaris; }
 	const std::vector<SDL_Surface *> &Images() const { return images; }
+	const std::vector<common::Item *> &Items() const { return items; }
 	const std::vector<battle::Monster *> &Monsters() const { return monsters; }
 	const std::vector<int> &Numbers() const { return numbers; }
 	const std::vector<battle::PartyLayout *> &PartyLayouts() const { return partyLayouts; }
@@ -107,11 +114,15 @@ private:
 	graphics::Font *GetFont(const Value &);
 	graphics::Frame *GetFrame(const Value &);
 	graphics::Gauge *GetGauge(const Value &);
+	battle::Hero *GetHero(const Value &);
+	common::Ikari *GetIkari(const Value &);
 	SDL_Surface *GetImage(const Value &);
+	common::Item *GetItem(const Value &);
 	int GetNumber(const Value &);
 	battle::PartyLayout *GetPartyLayout(const Value &);
 	const PropertyList *GetPropertyList(const Value &);
 	const std::vector<PropertyList *> &GetPropertyListArray(const Value &);
+	const char *GetPath(const Value &);
 	common::Spell *GetSpell(const Value &);
 	graphics::Sprite *GetSprite(const Value &);
 	const char *GetString(const Value &);
@@ -125,6 +136,8 @@ private:
 	void ReadFrame(graphics::Frame &, const PropertyList &);
 	void ReadGauge(graphics::Gauge &, const PropertyList &);
 	void ReadHero(battle::Hero &, const PropertyList &);
+	void ReadIkari(common::Ikari &, const PropertyList &);
+	void ReadItem(common::Item &, const PropertyList &);
 	void ReadMonster(battle::Monster &, const PropertyList &);
 	void ReadPartyLayout(battle::PartyLayout &, const PropertyList &);
 	void ReadSimpleAnimation(graphics::SimpleAnimation &, const PropertyList &);
@@ -142,10 +155,13 @@ private:
 		FRAME,
 		GAUGE,
 		HERO,
+		IKARI,
 		IMAGE,
+		ITEM,
 		MONSTER,
 		NUMBER,
 		PARTY_LAYOUT,
+		PATH,
 		PROPERTY_LIST_ARRAY,
 		SIMPLE_ANIMATION,
 		SPELL,
@@ -164,13 +180,17 @@ private:
 	};
 	std::map<std::string, ParsedDefinition> parsedDefinitions;
 
+	std::map<std::string, SDL_Surface *> imageCache;
+
 	std::vector<bool> booleans;
 	std::vector<graphics::ComplexAnimation *> complexAnimations;
 	std::vector<graphics::Font *> fonts;
 	std::vector<graphics::Frame *> frames;
 	std::vector<graphics::Gauge *> gauges;
 	std::vector<battle::Hero *> heroes;
+	std::vector<common::Ikari *> ikaris;
 	std::vector<SDL_Surface *> images;
+	std::vector<common::Item *> items;
 	std::vector<battle::Monster *> monsters;
 	std::vector<int> numbers;
 	std::vector<battle::PartyLayout *> partyLayouts;