1 files changed, 15 insertions, 15 deletions

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 8b91859..154135f 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -8,18 +8,18 @@
 using namespace crepe;
 
 Animator::Animator(uint32_t id, Sprite & ss, unsigned int max_row, unsigned int max_col,
-				   const Animator::Data & ctx)
+				   const Animator::Data & data)
 	: Component(id),
 	  spritesheet(ss),
-	  row(max_row),
-	  col(max_col),
-	  data(ctx) {
+	  max_rows(max_row),
+	  max_columns(max_col),
+	  data(data) {
 	dbg_trace();
 
-	this->spritesheet.mask.h /= this->col;
-	this->spritesheet.mask.w /= this->row;
-	this->spritesheet.mask.x = this->data.curr_row * this->spritesheet.mask.w;
-	this->spritesheet.mask.y = this->data.curr_col * this->spritesheet.mask.h;
+	this->spritesheet.mask.h /= this->max_columns;
+	this->spritesheet.mask.w /= this->max_rows;
+	this->spritesheet.mask.x = this->data.row * this->spritesheet.mask.w;
+	this->spritesheet.mask.y = this->data.col * this->spritesheet.mask.h;
 
 	// need to do this for to get the aspect ratio for a single clipping in the spritesheet
 	this->spritesheet.aspect_ratio
@@ -36,8 +36,8 @@ void Animator::pause() { this->active = false; }
 
 void Animator::stop() {
 	this->active = false;
-	this->data.curr_col = 0;
-	this->data.curr_row = 0;
+	this->data.col = 0;
+	this->data.row = 0;
 }
 void Animator::set_fps(int fps) { this->data.fps = fps; }
 
@@ -47,13 +47,13 @@ void Animator::set_cycle_range(int start, int end) {
 
 void Animator::set_anim(int col) {
 	Animator::Data & ctx = this->data;
-	this->spritesheet.mask.x = ctx.curr_row = 0;
-	ctx.curr_col = col;
-	this->spritesheet.mask.y = ctx.curr_col * this->spritesheet.mask.h;
+	this->spritesheet.mask.x = ctx.row = 0;
+	ctx.col = col;
+	this->spritesheet.mask.y = ctx.col * this->spritesheet.mask.h;
 }
 
 void Animator::next_anim() {
 	Animator::Data & ctx = this->data;
-	ctx.curr_row = ctx.curr_row++ % this->row;
-	this->spritesheet.mask.x = ctx.curr_row * this->spritesheet.mask.w;
+	ctx.row = ctx.row++ % this->max_rows;
+	this->spritesheet.mask.x = ctx.row * this->spritesheet.mask.w;
 }