X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FCaster.h;h=05eada4c8b5ef964cb00aae94bc691050de56732;hb=45bb35881a10720ae26701ddf075f756419cd627;hp=2aa6be09ed5762d8dae481bf321813d10f94e851;hpb=0285546b22f9e8f496ca6b1abffdd232647b6b6a;p=l2e.git

diff --git a/src/loader/Caster.h b/src/loader/Caster.h
index 2aa6be0..05eada4 100644
--- a/src/loader/Caster.h
+++ b/src/loader/Caster.h
@@ -1,11 +1,27 @@
 #ifndef LOADER_CASTER_H_
 #define LOADER_CASTER_H_
 
-#include "Interpreter.h"
-#include "../battle/fwd.h"
-#include "../common/fwd.h"
-#include "../map/fwd.h"
-#include "../menu/fwd.h"
+namespace battle {
+	struct Resources;
+	class Monster;
+	class PartyLayout;
+}
+namespace common {
+	class Capsule;
+	class Hero;
+	class Item;
+	class Spell;
+}
+namespace loader {
+	class Interpreter;
+	class Loader;
+}
+namespace map {
+	class Map;
+}
+namespace menu {
+	struct Resources;
+}
 
 #include <string>
 
@@ -14,7 +30,7 @@ namespace loader {
 class Caster {
 
 public:
-	Caster(Interpreter &intp);
+	Caster(Loader &ld, Interpreter &intp);
 	~Caster() { }
 private:
 	Caster(const Caster &);
@@ -22,6 +38,7 @@ private:
 
 public:
 	battle::Resources *GetBattleResources(const std::string &identifier);
+	common::Capsule *GetCapsule(const std::string &identifier);
 	common::Hero *GetHero(const std::string &identifier);
 	common::Item *GetItem(const std::string &identifier);
 	map::Map *GetMap(const std::string &identifier);
@@ -31,10 +48,14 @@ public:
 	common::Spell *GetSpell(const std::string &identifier);
 
 private:
+	void *GetObject(int typeId, const std::string &ident);
+
+private:
+	Loader &ld;
 	Interpreter &intp;
 
 };
 
 }
 
-#endif /* LOADER_CASTER_H_ */
+#endif