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

diff --git a/src/loader/Caster.h b/src/loader/Caster.h
index 2718fc0..05eada4 100644
--- a/src/loader/Caster.h
+++ b/src/loader/Caster.h
@@ -1,35 +1,36 @@
-/*
- * Caster.h
- *
- *  Created on: Sep 19, 2012
- *      Author: holy
- */
-
 #ifndef LOADER_CASTER_H_
 #define LOADER_CASTER_H_
 
-#include "Interpreter.h"
-
-#include <string>
-
 namespace battle {
-	class Hero;
+	struct Resources;
 	class Monster;
 	class PartyLayout;
-	class Resources;
 }
-
 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>
 
 namespace loader {
 
 class Caster {
 
 public:
-	Caster(Interpreter &intp);
+	Caster(Loader &ld, Interpreter &intp);
 	~Caster() { }
 private:
 	Caster(const Caster &);
@@ -37,24 +38,24 @@ private:
 
 public:
 	battle::Resources *GetBattleResources(const std::string &identifier);
-	battle::Hero *GetHero(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 monsterId;
-	int partyLayoutId;
-	int spellId;
+private:
+	Loader &ld;
+	Interpreter &intp;
 
 };
 
 }
 
-#endif /* LOADER_CASTER_H_ */
+#endif