X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=dfe9618cf844ccada668f5a34a01af3fb84dce68;hb=3f2e68e7a2377db6d1738934150f34b80bdbd0e0;hp=4b4ca58f1f4475076d1b4d3186234b9247d53e72;hpb=04b582180c8f86f50f08f5141a2514a1fcda3e01;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 4b4ca58..dfe9618 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -97,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);
@@ -109,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);
@@ -121,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);
@@ -133,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;
 
@@ -155,15 +163,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 +182,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 +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"));