Merge remote-tracking branch 'origin/niels/UI' into max/game

1 files changed, 6 insertions, 7 deletions

diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index ec9a445..1a30502 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -25,23 +25,22 @@ void AnimatorSystem::frame_update() {
 		a.elapsed_time += elapsed_time;
 		duration_t frame_duration = 1000ms / ctx.fps;
 
-		if (a.elapsed_time <= frame_duration) continue;
-
-		a.elapsed_time = 0ms;
-		a.frame++;
-
 		int cycle_end = (ctx.cycle_end == -1) ? a.grid_size.x : ctx.cycle_end;
 		int total_frames = cycle_end - ctx.cycle_start;
 		int curr_cycle_frame = (a.frame - ctx.cycle_start) % total_frames;
 
+		if (a.elapsed_time >= frame_duration) {
+			a.elapsed_time = 0ms;
+			a.frame++;
+		}
+
 		if (!ctx.looping && a.frame >= cycle_end) {
 			a.active = false;
 			continue;
 		}
 
 		ctx.row = (ctx.cycle_start + curr_cycle_frame) % a.grid_size.x;
-		ctx.col = curr_cycle_frame / a.grid_size.x;
-
+		//ctx.col = curr_cycle_frame / a.grid_size.x;
 		a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w;
 		a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y;
 	}