forced fonts to use the data's charset

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 4b4ca58f1f4475076d1b4d3186234b9247d53e72..b4be5be0cb327ea3a2c3a462384bdcdc480ede7b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -155,15 +155,7 @@ 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"));
@@ -182,7 +174,7 @@ int main(int argc, char **argv) {
 
                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);
@@ -210,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"));