X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=5f358fbe45c031f2420749654f97885941e29c8b;hb=8c055cbdddac2114c130e6a6524ff887d89ccf53;hp=1b012503551b23b73d386ae5eb81b8a49f6baeec;hpb=c61de0e168aa0ff5d5f1e429302d1cb2160ac1e4;p=l2e.git

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 1b01250..5f358fb 100644
--- 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);
+	Vector<int> offset(battle->CalculateScreenOffset(screen));
+	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());
-	Vector<int> offset(battle->CalculateScreenOffset(screen));
 	int width(battle->BackgroundWidth() - 2 * frame->BorderWidth());
 	// TODO: replace with font 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);
+}
+
 }