X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectAttackType.cpp;h=b4f5dcc73f69a071bc4877d682dc27d2c52da2c4;hb=eb2ad5ffd08128d31af32f3929a3295fcfa251e9;hp=c0548132b536c115d5cee98265ce4afd43856ace;hpb=4d0a650b178d81387caa36953ed06cc5d6c28213;p=l2e.git

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index c054813..b4f5dcc 100644
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -1,40 +1,60 @@
-/*
- * SelectAttackType.cpp
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #include "SelectAttackType.h"
 
+#include "SelectIkari.h"
+#include "SelectItem.h"
+#include "SelectMoveAction.h"
+#include "SelectSpell.h"
+#include "SelectTarget.h"
 #include "../AttackChoice.h"
 #include "../BattleState.h"
+#include "../../app/Application.h"
 #include "../../app/Input.h"
-#include "../../geometry/operators.h"
+#include "../../common/Item.h"
+#include "../../math/Vector.h"
 
 #include <stdexcept>
 
+using app::Application;
 using app::Input;
-using geometry::Point;
-using geometry::Vector;
+using common::Item;
+using math::Vector;
 
 namespace battle {
 
-void SelectAttackType::EnterState(app::Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SelectAttackType::OnEnterState(SDL_Surface *screen) {
+	OnResize(screen->w, screen->h);
 }
 
-void SelectAttackType::ExitState() {
-	ctrl = 0;
+void SelectAttackType::OnExitState(SDL_Surface *screen) {
+
 }
 
+void SelectAttackType::OnResumeState(SDL_Surface *screen) {
+	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
+		battle->ActiveHero().GetAttackChoice().SetType(battle->GetAttackTypeMenu().Selected());
+		battle->NextHero();
+	}
+	if (battle->AttackSelectionDone()) {
+		// pass through
+		Ctrl().PopState();
+	}
+}
 
-void SelectAttackType::Resize(int width, int height) {
+void SelectAttackType::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SelectAttackType::HandleInput(const Input &input) {
+void SelectAttackType::OnResize(int width, int height) {
+	Vector<int> offset(battle->ScreenOffset());
+	Vector<int> position(
+			(battle->Width() - battle->GetAttackTypeMenu().Width()) / 2,
+			battle->Height() - battle->GetAttackTypeMenu().Height() - battle->GetAttackTypeMenu().Height() / 2);
+	menuOffset = offset + position;
+}
+
+
+void SelectAttackType::HandleEvents(const Input &input) {
 	if (input.IsDown(Input::PAD_UP)) {
 		battle->GetAttackTypeMenu().Select(AttackChoice::MAGIC);
 	} else if (input.IsDown(Input::PAD_RIGHT)) {
@@ -47,46 +67,71 @@ void SelectAttackType::HandleInput(const Input &input) {
 		battle->GetAttackTypeMenu().Select(AttackChoice::SWORD);
 	}
 
+	Hero &hero(battle->ActiveHero());
+	AttackChoice &ac(hero.GetAttackChoice());
 	if (input.JustPressed(Input::ACTION_A)) {
 		switch (battle->GetAttackTypeMenu().Selected()) {
 			case AttackChoice::SWORD:
-				// TODO: switch to next character
+				if (hero.HasWeapon()) {
+					if (hero.Weapon()->GetTargetingMode().TargetsAll()) {
+						ac.SetType(AttackChoice::SWORD);
+						battle->NextHero();
+						break;
+					} else {
+						ac.Selection().ReadMode(hero.Weapon()->GetTargetingMode());
+					}
+				} else {
+					ac.Selection().SetSingle();
+				}
+				ac.Selection().Reset();
+				Ctrl().PushState(new SelectTarget(battle, this, &ac.Selection(), battle->Res().weaponTargetCursor));
 				break;
 			case AttackChoice::MAGIC:
-				// TODO: switch to spell select
+				if (battle->ActiveHero().CanUseMagic()) {
+					Ctrl().PushState(new SelectSpell(battle, this));
+				}
 				break;
 			case AttackChoice::DEFEND:
-				// TODO: switch to next character
+				ac.SetType(AttackChoice::DEFEND);
+				battle->NextHero();
 				break;
 			case AttackChoice::IKARI:
-				// TODO: switch to ikari attack select
+				Ctrl().PushState(new SelectIkari(battle, this));
 				break;
 			case AttackChoice::ITEM:
-				// TODO: switch to item select
+				Ctrl().PushState(new SelectItem(battle, this));
 				break;
 			default:
 				throw std::logic_error("selected invalid attack type");
 		}
+	} else if (input.JustPressed(Input::ACTION_B)) {
+		ac.Reset();
+		battle->PreviousHero();
+		if (battle->BeforeFirstHero()) {
+			Ctrl().ChangeState(new SelectMoveAction(battle));
+		} else {
+			battle->ActiveHero().GetAttackChoice().Reset();
+		}
+	}
+
+	if (battle->AttackSelectionDone()) {
+		Ctrl().PopState();
 	}
 }
 
-void SelectAttackType::UpdateWorld(float deltaT) {
+void SelectAttackType::UpdateWorld(Uint32 deltaT) {
 
 }
 
 void SelectAttackType::Render(SDL_Surface *screen) {
-	Vector<int> offset(battle->CalculateScreenOffset(screen));
-	battle->RenderBackground(screen, offset);
-	battle->RenderMonsters(screen, offset);
-	battle->RenderHeroTags(screen, offset);
-	RenderMenu(screen, offset);
+	battle->RenderBackground(screen);
+	battle->RenderMonsters(screen);
+	battle->RenderHeroTags(screen);
+	RenderMenu(screen);
 }
 
-void SelectAttackType::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
-	Point<int> position(
-			(battle->BackgroundWidth() - battle->GetAttackTypeMenu().Width()) / 2,
-			(battle->BackgroundHeight() * 3 / 4) - (battle->GetAttackTypeMenu().Height() / 2));
-	battle->GetAttackTypeMenu().Render(screen, position + offset);
+void SelectAttackType::RenderMenu(SDL_Surface *screen) {
+	battle->GetAttackTypeMenu().Render(screen, menuOffset);
 }
 
 }