X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FCaster.h;h=3420f67984f5df0a83502742005a5635b1442371;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=72a92aa6bd2340773da9683fa9097e158d9fbbcf;hpb=2a1d9169e1f6c2dfe0f93ed40d5fb68d3da342af;p=l2e.git

diff --git a/src/loader/Caster.h b/src/loader/Caster.h
index 72a92aa..3420f67 100644
--- a/src/loader/Caster.h
+++ b/src/loader/Caster.h
@@ -1,16 +1,25 @@
-/*
- * Caster.h
- *
- *  Created on: Sep 19, 2012
- *      Author: holy
- */
-
 #ifndef LOADER_CASTER_H_
 #define LOADER_CASTER_H_
 
+namespace battle {
+	struct Resources;
+	class Monster;
+	class PartyLayout;
+}
+namespace common {
+	class Capsule;
+	class Hero;
+	class Item;
+	class Spell;
+}
+namespace map {
+	class Map;
+}
+namespace menu {
+	struct Resources;
+}
+
 #include "Interpreter.h"
-#include "../battle/fwd.h"
-#include "../common/fwd.h"
 
 #include <string>
 
@@ -27,8 +36,11 @@ 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);
@@ -36,13 +48,6 @@ public:
 private:
 	Interpreter &intp;
 
-	int battleResourcesId;
-	int heroId;
-	int itemId;
-	int monsterId;
-	int partyLayoutId;
-	int spellId;
-
 };
 
 }