removed lazy fwd headers

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

diff --git a/src/menu/StatusMenu.cpp b/src/menu/StatusMenu.cpp
index 3a9b38f3489f58fc0b282c8e9108e948afb8d536..41f848f82dde590cf55c6c872e7cd4469b1ccc7f 100644 (file)
--- a/src/menu/StatusMenu.cpp
+++ b/src/menu/StatusMenu.cpp
@@ -1,10 +1,3 @@
-/*
- * StatusMenu.cpp
- *
- *  Created on: Oct 22, 2012
- *      Author: holy
- */
-
 #include "StatusMenu.h"
 
 #include "HeroStatus.h"
@@ -19,12 +12,13 @@
 #include "../common/Stats.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::Hero;
 using common::Item;
 using common::Stats;
-using geometry::Vector;
+using math::Vector;
 using graphics::Font;
 using graphics::Frame;
 
@@ -88,7 +82,7 @@ void StatusMenu::HandleEvents(const Input &input) {
        }
 }
 
-void StatusMenu::UpdateWorld(float deltaT) {
+void StatusMenu::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -178,22 +172,10 @@ void StatusMenu::RenderEquipment(SDL_Surface *screen, const Vector<int> &offset)
        Vector<int> lineBreak(0, 2 * parent->Res().statusFont->CharHeight());
 
        Vector<int> position(offset);
-       RenderEquipmentLine(hero.Weapon(), screen, position);
-
-       position += lineBreak;
-       RenderEquipmentLine(hero.Armor(), screen, position);
-
-       position += lineBreak;
-       RenderEquipmentLine(hero.Shield(), screen, position);
-
-       position += lineBreak;
-       RenderEquipmentLine(hero.Helmet(), screen, position);
-
-       position += lineBreak;
-       RenderEquipmentLine(hero.Ring(), screen, position);
-
-       position += lineBreak;
-       RenderEquipmentLine(hero.Jewel(), screen, position);
+       for (int i = 0; i < Hero::EQUIP_COUNT; ++i) {
+               RenderEquipmentLine(hero.Equipment(Hero::EquipSlot(i)), screen, position);
+               position += lineBreak;
+       }
 }
 
 void StatusMenu::RenderEquipmentLine(const Item *item, SDL_Surface *screen, const Vector<int> &position) const {
@@ -209,7 +191,7 @@ void StatusMenu::RenderEquipmentLine(const Item *item, SDL_Surface *screen, cons
        }
 }
 
-void StatusMenu::RenderExperience(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void StatusMenu::RenderExperience(SDL_Surface *screen, const math::Vector<int> &offset) const {
        const Font &font(*parent->Res().statusFont);
        font.DrawStringRight(parent->Res().experienceLabel, screen, offset, 10);
 
@@ -217,7 +199,7 @@ void StatusMenu::RenderExperience(SDL_Surface *screen, const geometry::Vector<in
        font.DrawNumberRight(GetHero().Experience(), screen, numberOffset, 7);
 }
 
-void StatusMenu::RenderNextLevel(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void StatusMenu::RenderNextLevel(SDL_Surface *screen, const math::Vector<int> &offset) const {
        const Font &font(*parent->Res().statusFont);
        font.DrawStringRight(parent->Res().nextLevelLabel, screen, offset, 10);
 
@@ -225,7 +207,7 @@ void StatusMenu::RenderNextLevel(SDL_Surface *screen, const geometry::Vector<int
        font.DrawNumberRight(GetHero().NextLevel(), screen, numberOffset, 7);
 }
 
-void StatusMenu::RenderIkari(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void StatusMenu::RenderIkari(SDL_Surface *screen, const math::Vector<int> &offset) const {
        const Font &font(*parent->Res().statusFont);
        font.DrawString(parent->Res().ipLabel, screen, offset, 5);
 
@@ -236,7 +218,7 @@ void StatusMenu::RenderIkari(SDL_Surface *screen, const geometry::Vector<int> &o
        font.DrawChar('%', screen, percentOffset);
 }
 
-void StatusMenu::RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void StatusMenu::RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset) const {
        const Font &font(*parent->Res().normalFont);
        const Frame &frame(*parent->Res().statusFrame);