X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=f1e3d07caffc17676d1d5bcd85bc8b5f19a75c1b;hb=7b2600e51a05efe1c102389a25b8123f30a972b0;hp=5ba84db2583a17711e20304988bd0cf361e4ba48;hpb=4a1816af30dcfe53181a25355bd51cc7b24a83f1;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 5ba84db..f1e3d07 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -8,13 +8,18 @@
 #include "BattleState.h"
 
 #include "PartyLayout.h"
+#include "states/SelectMoveAction.h"
+#include "../app/Application.h"
+#include "../app/Input.h"
+#include "../geometry/operators.h"
 #include "../graphics/Sprite.h"
 
-#include <iostream>
 #include <stdexcept>
 
 using app::Application;
+using app::Input;
 using geometry::Point;
+using geometry::Vector;
 
 using std::vector;
 
@@ -27,25 +32,47 @@ void BattleState::AddMonster(const Monster &m) {
 	monsters.push_back(m);
 }
 
+void BattleState::AddHero(const Hero &h) {
+	if (heroes.size() >= heroesLayout->NumPositions()) {
+		throw std::overflow_error("too many heroes for layout");
+	}
+	heroes.push_back(h);
+}
+
 
 void BattleState::Resize(int w, int h) {
-	width = w;
-	height = h;
+
 }
 
 
 void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 	monstersLayout->CalculatePositions(background->w, background->h, monsterPositions);
-	width = screen->w;
-	height = screen->h;
+	heroesLayout->CalculatePositions(background->w, background->h, heroesPositions);
+	attackChoices.resize(heroes.size());
+	for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
+		heroTags.push_back(HeroTag(&heroes[i], &attackChoices[i], heroTagFrame, activeHeroTagFrame, healthGauge, manaGauge, ikariGauge, heroTagSprites, heroTagFont, HeroTag::Alignment((i + 1) % 2)));
+	}
+}
+
+void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {
+
+}
+
+void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) {
+	// TODO: check for victory, defeat or run
+	// reset attack choices
+	activeHero = -1;
+	attackChoices.clear();
+	attackChoices.resize(heroes.size());
+	ctrl.PushState(new SelectMoveAction(this));
 }
 
-void BattleState::ExitState() {
+void BattleState::PauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
 
-void BattleState::HandleEvent(const SDL_Event &) {
+void BattleState::HandleInput(const Input &input) {
 
 }
 
@@ -54,22 +81,50 @@ void BattleState::UpdateWorld(float deltaT) {
 }
 
 void BattleState::Render(SDL_Surface *screen) {
+	Vector<int> offset(CalculateScreenOffset(screen));
+
+	RenderBackground(screen, offset);
+	RenderMonsters(screen, offset);
+//	RenderHeroes(screen, offset);
+	RenderHeroTags(screen, offset);
+}
+
+void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offset) {
 	// black for now
 	SDL_FillRect(screen, 0, SDL_MapRGB(screen->format, 0, 0, 0));
 	SDL_Rect destRect;
-	destRect.x = (width - background->w) / 2;
-	destRect.y = (height - background->h) / 2;
+	destRect.x = offset.X();
+	destRect.y = offset.Y();
 	destRect.w = background->w;
 	destRect.h = background->h;
-
-	std::cout << "screen: " << screen->w << "x" << screen->h << std::endl;
-	std::cout << "drawing to " << destRect.w << "x" << destRect.h << "+" << destRect.x << "+" << destRect.y << std::endl;
-
-	// TODO: center background if screen bigger
 	SDL_BlitSurface(background, 0, screen, &destRect);
+}
 
+void BattleState::RenderMonsters(SDL_Surface *screen, const Vector<int> &offset) {
 	for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
-		monsters[i].Sprite()->DrawCenterBottom(screen, Point<int>(monsterPositions[i].X() + destRect.x, monsterPositions[i].Y() + destRect.y));
+		monsters[i].Sprite()->DrawCenterBottom(screen, monsterPositions[i] + offset);
+	}
+}
+
+void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
+	for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
+		heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset);
+	}
+}
+
+void BattleState::RenderHeroTags(SDL_Surface *screen, const Vector<int> &offset) {
+	int tagHeight(attackTypeMenu.Height());
+	int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2);
+	int xOffset((BackgroundWidth() - 2 * tagWidth) / 2);
+
+	Point<int> tagPosition[4];
+	tagPosition[0] = Point<int>(xOffset, BackgroundHeight() - 2 * tagHeight);
+	tagPosition[1] = Point<int>(xOffset + tagWidth, BackgroundHeight() - 2 * tagHeight);
+	tagPosition[2] = Point<int>(xOffset, BackgroundHeight() - tagHeight);
+	tagPosition[3] = Point<int>(xOffset + tagWidth, BackgroundHeight() - tagHeight);
+
+	for (vector<HeroTag>::size_type i(0), end(heroTags.size()); i < end; ++i) {
+		heroTags[i].Render(screen, tagWidth, tagHeight, tagPosition[i] + offset, (int)i == activeHero);
 	}
 }