moved spell menu template to resources

[l2e.git] / src / battle / states / SelectSpell.cpp

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 66b55f16d9dfe785a6c60ae5d54af51aaa7d0ed7..5f358fbe45c031f2420749654f97885941e29c8b 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -63,13 +63,23 @@ void SelectSpell::UpdateWorld(float deltaT) {
 
 void SelectSpell::Render(SDL_Surface *screen) {
        parent->Render(screen);
-       const Frame &frame(battle->GetSelectFrame());
-       Point<int> position(frame.BorderWidth(), frame.BorderHeight());
        Vector<int> offset(battle->CalculateScreenOffset(screen));
-       int width(battle->BackgroundWidth() - 2 * frame.BorderWidth());
+       RenderFrame(screen, offset);
+       RenderMenu(screen, offset);
+}
+
+void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
+       const Frame *frame(battle->Res().selectFrame);
+       Point<int> position(frame->BorderWidth(), frame->BorderHeight());
+       int width(battle->BackgroundWidth() - 2 * frame->BorderWidth());
        // TODO: replace with font height
-       int height(frame.BorderHeight() * 13);
-       frame.Draw(screen, position + offset, width, height);
+       int height(frame->BorderHeight() * 13);
+       frame->Draw(screen, position + offset, width, height);
+}
+
+void SelectSpell::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
+       Point<int> position(2 * battle->Res().selectFrame->BorderWidth(), 2 * battle->Res().selectFrame->BorderHeight());
+       battle->GetSpellMenu().Draw(screen, position + offset);
 }
 
 }