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

diff --git a/src/main.cpp b/src/main.cpp
index a59818a..e39d318 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -73,10 +73,10 @@ int main(int argc, char **argv) {
 		monstersLayout.AddPosition(Point<Uint8>(168, 104));
 		monstersLayout.AddPosition(Point<Uint8>(208, 104));
 		PartyLayout heroesLayout;
-		heroesLayout.AddPosition(Point<Uint8>(27, 219));
-		heroesLayout.AddPosition(Point<Uint8>(104, 227));
-		heroesLayout.AddPosition(Point<Uint8>(66, 238));
-		heroesLayout.AddPosition(Point<Uint8>(143, 246));
+		heroesLayout.AddPosition(Point<Uint8>(48, 152));
+		heroesLayout.AddPosition(Point<Uint8>(80, 168));
+		heroesLayout.AddPosition(Point<Uint8>(128, 152));
+		heroesLayout.AddPosition(Point<Uint8>(160, 168));
 
 		SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
 		Sprite dummySprite(monsterImg, 64, 64);
@@ -147,6 +147,24 @@ int main(int argc, char **argv) {
 		SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png"));
 		Sprite moveIconsSprite(moveIconsImg, 32, 32);
 		battleRes.moveIcons = &moveIconsSprite;
+
+		SDL_Surface *titleFrameImg(IMG_Load("test-data/title-frame.png"));
+		Frame titleFrame(titleFrameImg, 16, 16);
+		battleRes.titleFrame = &titleFrame;
+
+		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
+		battleRes.titleFont = &largeFont;
+
 		SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
 		Sprite heroTagSprite(heroTagImg, 32, 16);
 		battleRes.heroTagLabels = &heroTagSprite;
@@ -540,6 +558,8 @@ int main(int argc, char **argv) {
 		battleRes.noEquipmentText = "No equip";
 		battleRes.ikariMenuPrototype = Menu<const Item *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, normalFont.CharHeight() / 2, normalFont.CharWidth(), 1, normalFont.CharWidth() * 2, 0, ':', 12, normalFont.CharWidth());
 
+		battleRes.escapeText = "Escapes.";
+
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);