added simple font implementation

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index ab02016cff4d67511af6f986f595067c58dfd875..850907f59552e356d1992f67d13f2435f6d1dd08 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,7 @@
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "geometry/Point.h"
+#include "graphics/Font.h"
 #include "graphics/Frame.h"
 #include "graphics/Gauge.h"
 #include "graphics/Sprite.h"
@@ -31,6 +32,7 @@ using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
 using geometry::Point;
+using graphics::Font;
 using graphics::Frame;
 using graphics::Gauge;
 using graphics::Sprite;
@@ -55,10 +57,10 @@ int main(int argc, char **argv) {
                // temporary test data
                SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
                PartyLayout monstersLayout;
-               monstersLayout.AddPosition(Point<Uint8>(104, 109));
-               monstersLayout.AddPosition(Point<Uint8>(140, 118));
-               monstersLayout.AddPosition(Point<Uint8>(176, 109));
-               monstersLayout.AddPosition(Point<Uint8>(212, 118));
+               monstersLayout.AddPosition(Point<Uint8>(88, 104));
+               monstersLayout.AddPosition(Point<Uint8>(128, 104));
+               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));
@@ -86,6 +88,11 @@ int main(int argc, char **argv) {
                Sprite attackIconsSprite(attackIcons, 32, 32);
                SDL_Surface *moveIcons(IMG_Load("test-data/move-icons.png"));
                Sprite moveIconsSprite(moveIcons, 32, 32);
+               SDL_Surface *heroTagSprites(IMG_Load("test-data/hero-tag-sprites.png"));
+               Sprite heroTagSprite(heroTagSprites, 32, 16);
+               SDL_Surface *numbers(IMG_Load("test-data/numbers.png"));
+               Sprite numbersSprite(numbers, 16, 16);
+               Font heroTagFont(&numbersSprite);
                SDL_Surface *tagFrames(IMG_Load("test-data/tag-frames.png"));
                Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33);
                Frame activeHeroTagFrame(tagFrames, 16, 16);
@@ -95,7 +102,7 @@ int main(int argc, char **argv) {
                Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
                Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
 
-               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge));
+               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge, &heroTagSprite, &heroTagFont));
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);