X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=dfe9618cf844ccada668f5a34a01af3fb84dce68;hb=3f2e68e7a2377db6d1738934150f34b80bdbd0e0;hp=28656c3b050a475badb08489d236fb255faef1b7;hpb=85f12b6b3dd4abb488a24b41d2d5d9725fb33462;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 28656c3..dfe9618 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);
@@ -96,6 +97,8 @@ int main(int argc, char **argv) {
 		maxim.SetMaxMana(20);
 		maxim.SetMana(20);
 		maxim.SetIP(0);
+		maxim.SetAttackFrames(3);
+		maxim.SetSpellFrames(2);
 
 		SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
 		Sprite selanSprite(selanImg, 64, 64);
@@ -108,6 +111,8 @@ int main(int argc, char **argv) {
 		selan.SetMaxMana(23);
 		selan.SetMana(23);
 		selan.SetIP(1);
+		selan.SetAttackFrames(3);
+		selan.SetSpellFrames(4);
 
 		SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
 		Sprite guySprite(guyImg, 64, 64);
@@ -120,6 +125,8 @@ int main(int argc, char **argv) {
 		guy.SetMaxMana(0);
 		guy.SetMana(0);
 		guy.SetIP(254);
+		guy.SetAttackFrames(3);
+		guy.SetSpellFrames(0);
 
 		SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
 		Sprite dekarSprite(dekarImg, 64, 64);
@@ -132,6 +139,8 @@ int main(int argc, char **argv) {
 		dekar.SetMaxMana(0);
 		dekar.SetMana(0);
 		dekar.SetIP(255);
+		dekar.SetAttackFrames(3);
+		dekar.SetSpellFrames(3);
 
 		battle::Resources battleRes;
 
@@ -147,18 +156,45 @@ 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, 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);
@@ -174,28 +210,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"));
@@ -540,6 +560,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);