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

diff --git a/src/loader/Caster.h b/src/loader/Caster.h
index c095cc9..05eada4 100644
--- a/src/loader/Caster.h
+++ b/src/loader/Caster.h
@@ -1,10 +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"
+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>
 
@@ -13,7 +30,7 @@ namespace loader {
 class Caster {
 
 public:
-	Caster(Interpreter &intp);
+	Caster(Loader &ld, Interpreter &intp);
 	~Caster() { }
 private:
 	Caster(const Caster &);
@@ -21,26 +38,24 @@ 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);
+	menu::Resources *GetMenuResources(const std::string &identifier);
 	battle::Monster *GetMonster(const std::string &identifier);
 	battle::PartyLayout *GetPartyLayout(const std::string &identifier);
 	common::Spell *GetSpell(const std::string &identifier);
 
 private:
-	Interpreter &intp;
+	void *GetObject(int typeId, const std::string &ident);
 
-	int battleResourcesId;
-	int heroId;
-	int itemId;
-	int mapId;
-	int monsterId;
-	int partyLayoutId;
-	int spellId;
+private:
+	Loader &ld;
+	Interpreter &intp;
 
 };
 
 }
 
-#endif /* LOADER_CASTER_H_ */
+#endif