diff --git a/engine/include/libgba-sprite-engine/sprites/sprite.h b/engine/include/libgba-sprite-engine/sprites/sprite.h index a55d511..ca2be27 100644 --- a/engine/include/libgba-sprite-engine/sprites/sprite.h +++ b/engine/include/libgba-sprite-engine/sprites/sprite.h @@ -58,7 +58,7 @@ protected: bool stayWithinBounds; u32 imageSize, tileIndex; SpriteSize spriteSize; - u32 animationDelay, amountOfFrames, beginFrame, currentFrame, animationCounter; + u32 animationDelay, numberOfFrames, beginFrame, currentFrame, animationCounter; bool animating; std::unique_ptr oam; @@ -73,13 +73,13 @@ public: explicit Sprite(const void *imageData, int imageSize, int x, int y, SpriteSize size); virtual ~Sprite() {} - void makeAnimated(int amountOfFrames, int animationDelay) { - this->amountOfFrames = amountOfFrames; + void makeAnimated(int numberOfFrames, int animationDelay) { + this->numberOfFrames = numberOfFrames; this->animationDelay = animationDelay; animate(); } - void makeAnimated(int beginFrame, int amountOfFrames, int animationDelay) { - this->amountOfFrames = amountOfFrames; + void makeAnimated(int beginFrame, int numberOfFrames, int animationDelay) { + this->numberOfFrames = numberOfFrames; this->animationDelay = animationDelay; this->beginFrame = beginFrame; this->currentFrame = beginFrame; diff --git a/engine/src/sprites/sprite.cpp b/engine/src/sprites/sprite.cpp index 243df73..7eb9b4e 100644 --- a/engine/src/sprites/sprite.cpp +++ b/engine/src/sprites/sprite.cpp @@ -14,7 +14,7 @@ Sprite::Sprite(const Sprite &other) : Sprite(nullptr, 0, other.x, other.y, other Sprite::Sprite(const void *imageData, int imageSize, int x, int y, SpriteSize size) : x(x), y(y), data(imageData), imageSize(imageSize), spriteSize(size), - animationDelay(0), amountOfFrames(0), beginFrame(0), currentFrame(0), animationCounter(0) { + animationDelay(0), numberOfFrames(0), beginFrame(0), currentFrame(0), animationCounter(0) { setAttributesBasedOnSize(size); } @@ -86,7 +86,7 @@ void Sprite::updateAnimation() { animationCounter++; if(animationCounter > animationDelay) { currentFrame++; - if(currentFrame > (amountOfFrames - 1) + beginFrame) { + if(currentFrame > (numberOfFrames - 1) + beginFrame) { currentFrame = beginFrame; } if(currentFrame < beginFrame) {