X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=2901874172052e95fd7234e6787465b9777cf801;hb=7cabfe225d70f2a7c0770fde3091e744fc0e4dd2;hp=8325163ef61c435ec662e2d0e0c8f96c74cbe018;hpb=1c5b28e8559e8383958307534e262a9b29f50fdf;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 8325163..2901874 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -263,29 +263,30 @@ int main(int argc, char **argv) { Font largeFont(&largeFontSprite, 0, -2); battleRes.titleFont = &largeFont; - 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)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -48)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); - battleRes.numberAnimationPrototype.AddFrame(0, 0); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -24)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); - battleRes.numberAnimationPrototype.AddFrame(0, 0); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); - battleRes.numberAnimationPrototype.AddFrames(0, 0, Vector(), 14); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -36)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -32)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -18)); + ComplexAnimation numberAnimationPrototype(0, framerate); + numberAnimationPrototype.AddFrame(0, 0); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -48)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); + numberAnimationPrototype.AddFrame(0, 0); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -24)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); + numberAnimationPrototype.AddFrame(0, 0); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); + numberAnimationPrototype.AddFrames(0, 0, Vector(), 14); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -36)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -32)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -18)); + battleRes.numberAnimationPrototype = &numberAnimationPrototype; SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png")); Sprite bigNumbersSprite(bigNumbersImg, 16, 32);