#include "NumberAnimation.h"
-#include "../geometry/operators.h"
#include "../geometry/Vector.h"
using app::State;
-using geometry::Point;
using geometry::Vector;
-using graphics::ComplexAnimation;
+using graphics::Animation;
+using graphics::AnimationRunner;
using graphics::Sprite;
namespace battle {
-NumberAnimation::NumberAnimation(int number, const ComplexAnimation &a, const Sprite *numbers)
+NumberAnimation::NumberAnimation(int number, const Animation *a, const Sprite *numbers)
: number(number) {
- animation[0] = a;
- animation[1] = a;
- animation[2] = a;
- animation[3] = a;
+ animation[0] = AnimationRunner(a);
+ animation[1] = AnimationRunner(a);
+ animation[2] = AnimationRunner(a);
+ animation[3] = AnimationRunner(a);
animation[0].ChangeSprite(numbers);
animation[1].ChangeSprite(numbers);
return animation[0].GetSprite()->Height();
}
-void NumberAnimation::Draw(SDL_Surface *dest, const Point<int> &positionIn) const {
- Point<int> position(positionIn);
+void NumberAnimation::Draw(SDL_Surface *dest, const Vector<int> &positionIn) const {
+ Vector<int> position(positionIn);
Vector<int> step(animation[0].GetSprite()->Width(), 0);
if (number > 999) {
if (animation[0].Running()) {