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

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 25fb09c..5f50109 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -7,12 +7,27 @@
 
 #include "BattleState.h"
 
+#include "PartyLayout.h"
+#include "../graphics/Sprite.h"
+
+#include <stdexcept>
+
 using app::Application;
 
+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::EnterState(Application &ctrl, SDL_Surface *screen) {
+	monstersLayout->CalculatePositions(background->w, background->h, monsterPositions);
 }
 
 void BattleState::ExitState() {
@@ -31,6 +46,9 @@ void BattleState::UpdateWorld(float deltaT) {
 void BattleState::Render(SDL_Surface *screen) {
 	// TODO: center background if screen bigger
 	SDL_BlitSurface(background, 0, screen, 0);
+	for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
+		monsters[i].Sprite()->DrawCenterBottom(screen, monsterPositions[i]);
+	}
 }
 
 }