X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=841dc616f35cee60c181ee43324b29f197942ac1;hb=f89e79ad6fdc3009657e81f3dc3765d661f4899c;hp=909cbd4be04c6292f990c661fd4d5dd265762c09;hpb=8a6225176cd0946363ac2d8219d54a13009de675;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 909cbd4..841dc61 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -66,6 +66,8 @@ int main(int argc, char **argv) { const int width = 800; const int height = 480; + const int framerate = 33; + try { InitSDL sdl; InitImage image(IMG_INIT_PNG); @@ -103,23 +105,26 @@ int main(int argc, char **argv) { maxim.SetMaxMana(20); maxim.SetMana(20); maxim.SetIP(0); - ComplexAnimation maximAttackAnimation(&maximSprite, 30); - maximAttackAnimation.AddFrame(1, 0, Vector(2, 0)); - maximAttackAnimation.AddFrame(1, 0, Vector(2, -1)); - maximAttackAnimation.AddFrames(2, 0, Vector(2, -2), 2); - maximAttackAnimation.AddFrame(2, 0, Vector(4, -2)); - maximAttackAnimation.AddFrame(2, 0, Vector(3, -1)); + ComplexAnimation maximAttackAnimation(&maximSprite, framerate); + // TODO: cross check double frames; could be related to differences in framerates + maximAttackAnimation.AddFrames(1, 0, Vector(0, 0), 7); // TODO: maybe this could also be a pause before the battle animation + maximAttackAnimation.AddFrames(1, 0, Vector(4, -1), 2); + maximAttackAnimation.AddFrames(2, 0, Vector(4, -2), 2); + maximAttackAnimation.AddFrames(2, 0, Vector(6, -2), 2); + maximAttackAnimation.AddFrames(2, 1, Vector(6, -1), 1); maximAttackAnimation.AddFrames(2, 1, Vector(3, -1), 2); - maximAttackAnimation.AddFrame(2, 1); - maximAttackAnimation.AddFrames(2, 2, Vector(), 2); + maximAttackAnimation.AddFrames(2, 1, Vector(0, 0), 1); + maximAttackAnimation.AddFrames(2, 2, Vector(0, 0), 2); + maximAttackAnimation.AddFrames(2, 2, Vector(2, 0), 1); + maximAttackAnimation.AddFrames(1, 0, Vector(0, 0), 7); // TODO: maybe this could also be a pause between two animations maxim.SetAttackAnimation(&maximAttackAnimation); - ComplexAnimation maximSpellAnimation(&maximSprite, 150); + ComplexAnimation maximSpellAnimation(&maximSprite, 5 * framerate); maximSpellAnimation.AddFrames(3, 0, Vector(), 2); maximSpellAnimation.AddFrame(3, 1); maxim.SetSpellAnimation(&maximSpellAnimation); SDL_Surface *maximMeleeImg(IMG_Load("test-data/melee-maxim.png")); Sprite maximMeleeSprite(maximMeleeImg, 96, 96); - SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 30, 4); + SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 2 * framerate, 4); maxim.SetMeleeAnimation(&maximMeleeAnimation); SDL_Surface *selanImg(IMG_Load("test-data/selan.png")); @@ -133,7 +138,7 @@ int main(int argc, char **argv) { selan.SetMaxMana(23); selan.SetMana(23); selan.SetIP(1); - ComplexAnimation selanAttackAnimation(&selanSprite, 30); + ComplexAnimation selanAttackAnimation(&selanSprite, framerate); selanAttackAnimation.AddFrames(1, 0, Vector(4, 0), 2); selanAttackAnimation.AddFrame(1, 0, Vector(8, 2)); selanAttackAnimation.AddFrame(2, 0, Vector(10, 4)); @@ -145,12 +150,16 @@ int main(int argc, char **argv) { selanAttackAnimation.AddFrame(2, 2, Vector(-8, -8)); selanAttackAnimation.AddFrame(2, 2); selan.SetAttackAnimation(&selanAttackAnimation); - ComplexAnimation selanSpellAnimation(&selanSprite, 30); + ComplexAnimation selanSpellAnimation(&selanSprite, framerate); selanSpellAnimation.AddFrames(2, 0, Vector(), 3); selanSpellAnimation.AddFrames(2, 1, Vector(), 2); selanSpellAnimation.AddFrames(2, 2, Vector(), 3); selanSpellAnimation.AddFrames(2, 3, Vector(), 2); selan.SetSpellAnimation(&selanSpellAnimation); + SDL_Surface *selanMeleeImg(IMG_Load("test-data/melee-selan.png")); + Sprite selanMeleeSprite(selanMeleeImg, 96, 96); + SimpleAnimation selanMeleeAnimation(&selanMeleeSprite, 2 * framerate, 4); + selan.SetMeleeAnimation(&selanMeleeAnimation); SDL_Surface *guyImg(IMG_Load("test-data/guy.png")); Sprite guySprite(guyImg, 64, 64); @@ -163,7 +172,7 @@ int main(int argc, char **argv) { guy.SetMaxMana(0); guy.SetMana(0); guy.SetIP(254); - ComplexAnimation guyAttackAnimation(&guySprite, 30); + ComplexAnimation guyAttackAnimation(&guySprite, framerate); guyAttackAnimation.AddFrames(1, 0, Vector(-4, 0), 2); guyAttackAnimation.AddFrames(1, 0, Vector(-8, 0), 2); guyAttackAnimation.AddFrames(2, 0, Vector(-8, 0), 2); @@ -175,6 +184,10 @@ int main(int argc, char **argv) { guyAttackAnimation.AddFrame(2, 2, Vector(10, 0)); guyAttackAnimation.AddFrame(2, 2); guy.SetAttackAnimation(&guyAttackAnimation); + SDL_Surface *guyMeleeImg(IMG_Load("test-data/melee-guy.png")); + Sprite guyMeleeSprite(guyMeleeImg, 96, 96); + SimpleAnimation guyMeleeAnimation(&guyMeleeSprite, 2 * framerate, 4); + guy.SetMeleeAnimation(&guyMeleeAnimation); SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png")); Sprite dekarSprite(dekarImg, 64, 64); @@ -187,7 +200,7 @@ int main(int argc, char **argv) { dekar.SetMaxMana(0); dekar.SetMana(0); dekar.SetIP(255); - ComplexAnimation dekarAttackAnimation(&dekarSprite, 30); + ComplexAnimation dekarAttackAnimation(&dekarSprite, framerate); dekarAttackAnimation.AddFrame(1, 0, Vector(4, 0)); dekarAttackAnimation.AddFrame(1, 0, Vector(8, 2)); dekarAttackAnimation.AddFrame(2, 0, Vector(12, 4)); @@ -198,11 +211,15 @@ int main(int argc, char **argv) { dekarAttackAnimation.AddFrame(2, 2, Vector(-2, 0)); dekarAttackAnimation.AddFrames(2, 2, Vector(0, 0), 3); dekar.SetAttackAnimation(&dekarAttackAnimation); - ComplexAnimation dekarSpellAnimation(&dekarSprite, 30); + ComplexAnimation dekarSpellAnimation(&dekarSprite, framerate); dekarSpellAnimation.AddFrames(2, 0, Vector(), 6); dekarSpellAnimation.AddFrames(2, 1, Vector(), 2); dekarSpellAnimation.AddFrames(2, 2, Vector(), 3); dekar.SetSpellAnimation(&dekarSpellAnimation); + SDL_Surface *dekarMeleeImg(IMG_Load("test-data/melee-dekar.png")); + Sprite dekarMeleeSprite(dekarMeleeImg, 96, 96); + SimpleAnimation dekarMeleeAnimation(&dekarMeleeSprite, 2 * framerate, 4); + dekar.SetMeleeAnimation(&dekarMeleeAnimation); battle::Resources battleRes; @@ -228,7 +245,7 @@ int main(int argc, char **argv) { Font largeFont(&largeFontSprite, 0, -2); battleRes.titleFont = &largeFont; - battleRes.numberAnimationPrototype = ComplexAnimation(0, 30); + battleRes.numberAnimationPrototype = ComplexAnimation(0, framerate); battleRes.numberAnimationPrototype.AddFrame(0, 0); battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); @@ -440,6 +457,10 @@ int main(int argc, char **argv) { battleRes.itemMenuHeadline = "Please choose an item."; battleRes.itemMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':'); + SDL_Surface *swordAttackImg(IMG_Load("test-data/attack-sword.png")); + Sprite swordAttackSprite(swordAttackImg, 96, 96); + SimpleAnimation swordAttackAnimation(&swordAttackSprite, 2 * framerate, 4); + Item zircoSword; zircoSword.SetName("Zirco sword"); zircoSword.SetMenuIcon(&swordIcon); @@ -449,7 +470,8 @@ int main(int argc, char **argv) { firestorm.GetTargetingMode().TargetAllEnemies(); firestorm.SetPhysical(); zircoSword.SetIkari(&firestorm); -// maxim.SetWeapon(&zircoSword); + zircoSword.SetAttackAnimation(&swordAttackAnimation); + maxim.SetWeapon(&zircoSword); Item zirconArmor; zirconArmor.SetName("Zircon armor"); zirconArmor.SetMenuIcon(&armorIcon); @@ -510,7 +532,7 @@ int main(int argc, char **argv) { thundershriek.GetTargetingMode().TargetAllEnemies(); thundershriek.SetPhysical(); zircoWhip.SetIkari(&thundershriek); - selan.SetWeapon(&zircoWhip); +// selan.SetWeapon(&zircoWhip); Item zirconPlate; zirconPlate.SetName("Zircon plate"); zirconPlate.SetMenuIcon(&armorIcon); @@ -571,7 +593,7 @@ int main(int argc, char **argv) { torrent.GetTargetingMode().TargetAllEnemies(); torrent.SetPhysical(); zircoAx.SetIkari(&torrent); - guy.SetWeapon(&zircoAx); +// guy.SetWeapon(&zircoAx); guy.SetArmor(&zirconArmor); Item megaShield; megaShield.SetName("Mega shield"); @@ -615,7 +637,7 @@ int main(int argc, char **argv) { dragonRush.GetTargetingMode().TargetSingleEnemy(); dragonRush.SetPhysical(); lizardBlow.SetIkari(&dragonRush); - dekar.SetWeapon(&lizardBlow); +// dekar.SetWeapon(&lizardBlow); Item holyRobe; holyRobe.SetName("Holy robe"); holyRobe.SetMenuIcon(&armorIcon);