removed lazy fwd headers

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

diff --git a/src/menu/StatusMenu.h b/src/menu/StatusMenu.h
index 40fac6b6a0e0b61bfe37aabd559ca7b309d06020..8c139a3a6e61291e9f46da09175f49452fe428f0 100644 (file)
--- a/src/menu/StatusMenu.h
+++ b/src/menu/StatusMenu.h
@@ -1,17 +1,20 @@
-/*
- * StatusMenu.h
- *
- *  Created on: Oct 22, 2012
- *      Author: holy
- */
-
 #ifndef MENU_STATUSMENU_H_
 #define MENU_STATUSMENU_H_
 
-#include "fwd.h"
+namespace common {
+       class Hero;
+       class Item;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+namespace menu {
+       class PartyMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../geometry/Vector.h"
+#include "../graphics/Menu.h"
 
 namespace menu {
 
@@ -23,7 +26,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:
@@ -43,20 +46,22 @@ private:
 
        const common::Hero &GetHero() const;
 
-       void RenderStatus(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderStats(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderStatsLine(const char *label, int number, SDL_Surface *screen, const geometry::Vector<int> &position) const;
-       void RenderEquipment(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderEquipmentLine(const common::Item *, SDL_Surface *screen, const geometry::Vector<int> &position) const;
+       void RenderStatus(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderStats(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderStatsLine(const char *label, int number, SDL_Surface *screen, const math::Vector<int> &position) const;
+       void RenderEquipment(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderEquipmentLine(const common::Item *, SDL_Surface *screen, const math::Vector<int> &position) const;
        /// @param offset the top right corner!
-       void RenderExperience(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+       void RenderExperience(SDL_Surface *screen, const math::Vector<int> &offset) const;
        /// @param offset the top right corner!
-       void RenderNextLevel(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderIkari(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+       void RenderNextLevel(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderIkari(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset) const;
 
 private:
        PartyMenu *parent;
        int cursor;
+       graphics::Menu<int> menu;
 
 };