X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=4053220b14c96b5c82076679a6070bc598b159d3;hb=0ef4dc19f03955b82d22330342acb179cf12b551;hp=2b46cacb879f405eb5d1118dc94d62d709fc8a59;hpb=c8dccd84477d10dcd3ec884478a9f26c16b54ad7;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 2b46cac..4053220 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -50,7 +50,7 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 	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, HeroTag::Alignment((i + 1) % 2)));
+		heroTags.push_back(HeroTag(&heroes[i], &attackChoices[i], heroTagFrame, activeHeroTagFrame, healthGauge, manaGauge, ikariGauge, heroTagSprites, HeroTag::Alignment((i + 1) % 2)));
 	}
 }
 
@@ -112,16 +112,15 @@ void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
 }
 
 void BattleState::RenderHeroTags(SDL_Surface *screen, const Vector<int> &offset) {
-	int margin(attackTypeMenu.Height() / 48);
-	int tagHeight(attackTypeMenu.Height() - 2 * margin);
-	int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2 - 2 * margin);
-	int xOffset((BackgroundWidth() - 2 * tagWidth - 2 * margin) / 2);
+	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 - margin);
-	tagPosition[1] = Point<int>(xOffset + tagWidth + 2 * margin, BackgroundHeight() - 2 * tagHeight - margin);
-	tagPosition[2] = Point<int>(xOffset, BackgroundHeight() - tagHeight - margin);
-	tagPosition[3] = Point<int>(xOffset + tagWidth + 2 * margin, BackgroundHeight() - tagHeight - margin);
+	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);