removed lazy fwd headers

[l2e.git] / src / menu / CapsuleFeedMenu.h

diff --git a/src/menu/CapsuleFeedMenu.h b/src/menu/CapsuleFeedMenu.h
index 1999674b6b453bbb1e8a2f4102865d4e517aa64e..91b2cc11242979f2a2114d471ac459702325d260 100644 (file)
--- a/src/menu/CapsuleFeedMenu.h
+++ b/src/menu/CapsuleFeedMenu.h
@@ -1,10 +1,19 @@
 #ifndef MENU_CAPSULEFEEDMENU_H_
 #define MENU_CAPSULEFEEDMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Capsule;
+       class Item;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class CapsuleMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../geometry/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {
@@ -19,7 +28,7 @@ public:
 
 public:
        virtual void HandleEvents(const app::Input &);
-       virtual void UpdateWorld(float deltaT);
+       virtual void UpdateWorld(Uint32 deltaT);
        virtual void Render(SDL_Surface *);
 
 public:
@@ -40,12 +49,12 @@ private:
        void LoadInventory();
        void FeedSelected();
 
-       void RenderName(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderSprite(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderGrowth(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderHunger(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderItems(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+       void RenderName(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderSprite(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderGrowth(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderHunger(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderItems(SDL_Surface *screen, const math::Vector<int> &offset) const;
 
 private:
        CapsuleMenu *parent;