X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=d1a983f23d198787daef4af3aac198e1d08db759;hb=59c61fdee1833094018d21e789a3548696c91543;hp=25fb09c0e59b171100f1de77f0bee853337e0243;hpb=5ef75aee810e5a687fae24e3f95886241e36efda;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 25fb09c..d1a983f 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -7,14 +7,36 @@
 
 #include "BattleState.h"
 
+#include "PartyLayout.h"
+#include "../graphics/Sprite.h"
+
+#include <stdexcept>
+
 using app::Application;
+using geometry::Point;
+
+using std::vector;
 
 namespace battle {
 
-void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
+void BattleState::AddMonster(const Monster &m) {
+	if (monsters.size() >= monstersLayout->NumPositions()) {
+		throw std::overflow_error("too many monsters for layout");
+	}
+	monsters.push_back(m);
+}
+
+
+void BattleState::Resize(int w, int h) {
 
 }
 
+
+void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
+	monstersLayout->CalculatePositions(background->w, background->h, monsterPositions);
+	heroesLayout->CalculatePositions(background->w, background->h, heroesPositions);
+}
+
 void BattleState::ExitState() {
 
 }
@@ -29,8 +51,20 @@ void BattleState::UpdateWorld(float deltaT) {
 }
 
 void BattleState::Render(SDL_Surface *screen) {
+	// black for now
+	SDL_FillRect(screen, 0, SDL_MapRGB(screen->format, 0, 0, 0));
+	SDL_Rect destRect;
+	destRect.x = (screen->w - background->w) / 2;
+	destRect.y = (screen->h - background->h) / 2;
+	destRect.w = background->w;
+	destRect.h = background->h;
+
 	// TODO: center background if screen bigger
-	SDL_BlitSurface(background, 0, screen, 0);
+	SDL_BlitSurface(background, 0, screen, &destRect);
+
+	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));
+	}
 }
 
 }