added action menu to equipment menu

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

diff --git a/src/menu/EquipMenu.cpp b/src/menu/EquipMenu.cpp
index da24f771f10723d342f00ea97fddf1f8fda58181..c604155861cc778196bbbf2752930574150fa46a 100644 (file)
--- a/src/menu/EquipMenu.cpp
+++ b/src/menu/EquipMenu.cpp
@@ -87,12 +87,16 @@ void EquipMenu::Render(SDL_Surface *screen) {
        Vector<int> equipOffset(
                        17 * parent->Res().statusFont->CharWidth(),
                        4 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
+       Vector<int> menuOffset(
+                       15 * parent->Res().statusFont->CharWidth(),
+                       17 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
 
        parent->RenderBackground(screen);
        parent->Res().shoulderNav->Draw(screen, offset + shoulderNavOffset);
        RenderStatus(screen, offset + parent->StatusOffset(0));
        RenderStats(screen, offset + statsOffset);
-       RenderEquipmentMenu(screen, equipOffset);
+       RenderEquipmentMenu(screen, offset + equipOffset);
+       RenderActionMenu(screen, offset + menuOffset);
 }
 
 int EquipMenu::Width() const {
@@ -146,7 +150,12 @@ void EquipMenu::RenderEquipmentMenu(SDL_Surface *screen, const Vector<int> &offs
 }
 
 void EquipMenu::RenderActionMenu(SDL_Surface *screen, const Vector<int> &offset) const {
+       const Font &font(*parent->Res().statusFont);
+       const Frame &frame(*parent->Res().statusFrame);
+       const Vector<int> menuOffset(3 * font.CharWidth(), font.CharHeight() + font.CharHeight() / 2);
 
+       frame.Draw(screen, offset, 15 * font.CharWidth(), 10 * font.CharHeight());
+       actionMenu.Draw(screen, offset + menuOffset);
 }
 
 void EquipMenu::RenderInventoryMenu(SDL_Surface *screen, const Vector<int> &offset) const {