X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=4b4ca58f1f4475076d1b4d3186234b9247d53e72;hb=04b582180c8f86f50f08f5141a2514a1fcda3e01;hp=cb4ad91317aa4d311a6dba3fe133e7b62ee36ec1;hpb=222167ba3722dc7f47ff7510006bd516e0010a50;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index cb4ad91..4b4ca58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,8 +74,8 @@ int main(int argc, char **argv) {
 		monstersLayout.AddPosition(Point<Uint8>(208, 104));
 		PartyLayout heroesLayout;
 		heroesLayout.AddPosition(Point<Uint8>(48, 152));
-		heroesLayout.AddPosition(Point<Uint8>(80, 168));
 		heroesLayout.AddPosition(Point<Uint8>(128, 152));
+		heroesLayout.AddPosition(Point<Uint8>(80, 168));
 		heroesLayout.AddPosition(Point<Uint8>(160, 168));
 
 		SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
@@ -169,6 +169,17 @@ int main(int argc, char **argv) {
 		SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
 		Sprite heroTagSprite(heroTagImg, 32, 16);
 		battleRes.heroTagLabels = &heroTagSprite;
+		battleRes.levelLabelCol = 0;
+		battleRes.levelLabelRow = 0;
+		battleRes.healthLabelCol = 0;
+		battleRes.healthLabelRow = 1;
+		battleRes.manaLabelCol = 0;
+		battleRes.manaLabelRow = 2;
+		battleRes.moveLabelCol = 0;
+		battleRes.moveLabelRow = 3;
+		battleRes.ikariLabelCol = 0;
+		battleRes.ikariLabelRow = 4;
+
 		SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png"));
 		Sprite numbersSprite(numbersImg, 16, 16);
 		Font heroTagFont(&numbersSprite);
@@ -178,6 +189,12 @@ int main(int argc, char **argv) {
 		battleRes.heroTagFrame = &heroTagFrame;
 		Frame activeHeroTagFrame(tagFramesImg, 16, 16);
 		battleRes.activeHeroTagFrame = &activeHeroTagFrame;
+		SDL_Surface *smallTagFrameImg(IMG_Load("test-data/small-tag-frame.png"));
+		Frame smallTagFrame(smallTagFrameImg, 8, 16);
+		battleRes.smallHeroTagFrame = &smallTagFrame;
+		Frame lastSmallTagFrame(smallTagFrameImg, 8, 16, 1, 1, 0, 33);
+		battleRes.lastSmallHeroTagFrame = &lastSmallTagFrame;
+		battleRes.heroesBgColor = SDL_MapRGB(screen.Screen()->format, 0x18, 0x28, 0x31);
 
 		SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
 		Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6);