X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.h;h=ffbad42e1a6ef1e2897305c55a04ad3090e38832;hb=b5056c2d3079c0143ed2c8f52cb5b2290a642aa7;hp=93a6e36227b576cc95744a80b4eb9522885e8a10;hpb=9a68d1231474bbc163b97398d3e4c87cbc4fd4ba;p=l2e.git

diff --git a/src/loader/Interpreter.h b/src/loader/Interpreter.h
index 93a6e36..ffbad42 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,6 +72,8 @@ 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);
@@ -86,7 +90,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,7 +113,10 @@ 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 &);
@@ -125,6 +134,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,7 +153,9 @@ private:
 		FRAME,
 		GAUGE,
 		HERO,
+		IKARI,
 		IMAGE,
+		ITEM,
 		MONSTER,
 		NUMBER,
 		PARTY_LAYOUT,
@@ -170,7 +183,9 @@ private:
 	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;