added attack type selection menu in battle state

[l2e.git] / src / battle / BattleState.cpp

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index c31786eed84aca8db1fa258bb43b8fb50738fa48..b11f52cc90b4950f73fd76641cc1699420d17bb3 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -8,12 +8,15 @@
 #include "BattleState.h"
 
 #include "PartyLayout.h"
+#include "../app/Application.h"
+#include "../app/Input.h"
 #include "../geometry/operators.h"
 #include "../graphics/Sprite.h"
 
 #include <stdexcept>
 
 using app::Application;
+using app::Input;
 using geometry::Point;
 using geometry::Vector;
 
@@ -51,8 +54,8 @@ void BattleState::ExitState() {
 }
 
 
-void BattleState::HandleEvent(const SDL_Event &) {
-
+void BattleState::HandleInput(const Input &input) {
+       attackTypeMenu.ReadInput(input);
 }
 
 void BattleState::UpdateWorld(float deltaT) {
@@ -66,7 +69,8 @@ void BattleState::Render(SDL_Surface *screen) {
 
        RenderBackground(screen, offset);
        RenderMonsters(screen, offset);
-       RenderHeroes(screen, offset);
+//     RenderHeroes(screen, offset);
+       attackTypeMenu.Render(screen, Point<int>(background->w / 2, background->h * 3 / 4));
 }
 
 void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offset) {