moved upgrade process to battle class

[l2e.git] / src / battle / Capsule.h

diff --git a/src/battle/Capsule.h b/src/battle/Capsule.h
index 8f268e18f4e74dc863b07e6b8550ce4fb33a84d0..48abe15defc6d7ea174cc6dd385e4aeb14e95b29 100644 (file)
--- a/src/battle/Capsule.h
+++ b/src/battle/Capsule.h
@@ -4,14 +4,18 @@
 namespace common {
        class Capsule;
 }
+namespace math {
+       template<class>
+       class Vector;
+}
 
 #include "AttackChoice.h"
 #include "../common/Stats.h"
-#include "../math/Vector.h"
 #include "../graphics/Animation.h"
-#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
+#include <SDL.h>
+
 namespace battle {
 
 class Capsule {
@@ -21,10 +25,13 @@ public:
 
 public:
        bool Active() const { return master; }
+       common::Capsule &Master() { return *master; }
+       const common::Capsule &Master() const { return *master; }
+
 
        const char *Name() const;
        Uint8 Level() const;
-       const graphics::Sprite *Sprite();
+       const graphics::Sprite *Sprite() const;
 
        Uint16 MaxHealth() const;
        Uint16 Health() const;
@@ -62,4 +69,4 @@ private:
 
 }
 
-#endif /* BATTLE_CAPSULE_H_ */
+#endif