extracted common capsule base

[l2e.git] / src / loader / Caster.h

diff --git a/src/loader/Caster.h b/src/loader/Caster.h
index 2718fc08f8327bcf7c9966ae145e0acefdc8a6b1..31ce61226677f40f8d32645bbf1d861e6680f3bf 100644 (file)
--- 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,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);
@@ -46,13 +34,6 @@ public:
 private:
        Interpreter &intp;
 
-       int battleResourcesId;
-       int heroId;
-       int itemId;
-       int monsterId;
-       int partyLayoutId;
-       int spellId;
-
 };
 
 }