renamed namespace geometry -> math

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

diff --git a/src/menu/StatusMenu.h b/src/menu/StatusMenu.h
index f6bcb293f37d782b3b380862149ad157a855366e..eaf10177a7c396317e3b695617ed78aa19f2ae65 100644 (file)
--- a/src/menu/StatusMenu.h
+++ b/src/menu/StatusMenu.h
@@ -1,17 +1,11 @@
-/*
- * StatusMenu.h
- *
- *  Created on: Oct 22, 2012
- *      Author: holy
- */
-
 #ifndef MENU_STATUSMENU_H_
 #define MENU_STATUSMENU_H_
 
 #include "fwd.h"
 #include "../app/State.h"
 #include "../common/fwd.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
+#include "../graphics/Menu.h"
 
 namespace menu {
 
@@ -43,19 +37,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 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;
 
 };