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

diff --git a/src/loader/Caster.h b/src/loader/Caster.h
index 2718fc0..2aa6be0 100644
--- a/src/loader/Caster.h
+++ b/src/loader/Caster.h
@@ -1,29 +1,14 @@
-/*
- * Caster.h
- *
- *  Created on: Sep 19, 2012
- *      Author: holy
- */
-
 #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"
 
 #include <string>
 
-namespace battle {
-	class Hero;
-	class Monster;
-	class PartyLayout;
-	class Resources;
-}
-
-namespace common {
-	class Item;
-	class Spell;
-}
-
 namespace loader {
 
 class Caster {
@@ -37,8 +22,10 @@ private:
 
 public:
 	battle::Resources *GetBattleResources(const std::string &identifier);
-	battle::Hero *GetHero(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);
@@ -46,13 +33,6 @@ public:
 private:
 	Interpreter &intp;
 
-	int battleResourcesId;
-	int heroId;
-	int itemId;
-	int monsterId;
-	int partyLayoutId;
-	int spellId;
-
 };
 
 }