X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=b4be5be0cb327ea3a2c3a462384bdcdc480ede7b;hb=6a8010e4ce63c8959c64e841cfe6ea7a2fcd8068;hp=e39d31830976b38b40e396da5f38a28dc114770a;hpb=923422e6a71f57b8fa24b826d1e2914faa144081;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index e39d318..b4be5be 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,13 +74,14 @@ 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"));
 		Sprite dummySprite(monsterImg, 64, 64);
 		Monster monster;
+		monster.SetName("Monster");
 		monster.SetSprite(&dummySprite);
 		monster.SetMaxHealth(10);
 		monster.SetHealth(10);
@@ -154,29 +155,38 @@ int main(int argc, char **argv) {
 
 		SDL_Surface *largeFontImg(IMG_Load("test-data/large-font.png"));
 		Sprite largeFontSprite(largeFontImg, 16, 32);
-		Font largeFont(&largeFontSprite);
-		largeFont.MapRange('A', 'M', 0, 1);
-		largeFont.MapRange('N', 'Z', 0, 2);
-		largeFont.MapRange('a', 'm', 0, 3);
-		largeFont.MapRange('n', 'z', 0, 4);
-		largeFont.MapChar(':', 10, 0);
-		largeFont.MapChar('!', 11, 0);
-		largeFont.MapChar('?', 12, 0);
-		// TODO: add '.' and '-' characters
+		Font largeFont(&largeFontSprite, 0, -2);
 		battleRes.titleFont = &largeFont;
 
 		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);
+		Font heroTagFont(&numbersSprite, 0, -3);
 		battleRes.heroTagFont = &heroTagFont;
 		SDL_Surface *tagFramesImg(IMG_Load("test-data/tag-frames.png"));
 		Frame heroTagFrame(tagFramesImg, 16, 16, 1, 1, 0, 33);
 		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);
@@ -192,28 +202,12 @@ int main(int argc, char **argv) {
 
 		SDL_Surface *normalFontImg(IMG_Load("test-data/normal-font.png"));
 		Sprite normalFontSprite(normalFontImg, 16, 16);
-		Font normalFont(&normalFontSprite);
-		normalFont.MapRange('A', 'M', 0, 1);
-		normalFont.MapRange('N', 'Z', 0, 2);
-		normalFont.MapRange('a', 'm', 0, 3);
-		normalFont.MapRange('n', 'z', 0, 4);
-		normalFont.MapChar(':', 10, 0);
-		normalFont.MapChar('!', 11, 0);
-		normalFont.MapChar('?', 12, 0);
-		// TODO: add '.' and '-' characters
+		Font normalFont(&normalFontSprite, 0, -2);
 		battleRes.normalFont = &normalFont;
 
 		SDL_Surface *disabledFontImg(IMG_Load("test-data/disabled-font.png"));
 		Sprite disabledFontSprite(disabledFontImg, 16, 16);
-		Font disabledFont(&disabledFontSprite);
-		disabledFont.MapRange('A', 'M', 0, 1);
-		disabledFont.MapRange('N', 'Z', 0, 2);
-		disabledFont.MapRange('a', 'm', 0, 3);
-		disabledFont.MapRange('n', 'z', 0, 4);
-		disabledFont.MapChar(':', 10, 0);
-		disabledFont.MapChar('!', 11, 0);
-		disabledFont.MapChar('?', 12, 0);
-		// TODO: add '.' and '-' characters
+		Font disabledFont(&disabledFontSprite, 0, -2);
 		battleRes.disabledFont = &disabledFont;
 
 		SDL_Surface *handCursorImg(IMG_Load("test-data/cursor-hand.png"));