Refactor animation count

Redo the logic to make Player EasyRPG#663 and Test case 32 pass

src/game_character.cpp

@@ -205,11 +205,11 @@ void Game_Character::UpdateAnimation(bool was_moving) {
 	if (IsSpinning()) {
 		const auto limit = spin_limits[step_idx];
 
-		if (GetAnimCount() >= limit) {
+		IncAnimCount();
+
+		if (GetAnimCount() > limit) {
 			SetSpriteDirection((GetSpriteDirection() + 1) % 4);
 			SetAnimCount(0);
-		} else {
-			IncAnimCount();
 		}
 		return;
 	}
@@ -224,21 +224,18 @@ void Game_Character::UpdateAnimation(bool was_moving) {
 	const auto stationary_limit = stationary_limits[step_idx];
 	const auto continuous_limit = continuous_limits[step_idx];
 
-	if (GetAnimCount() >= continuous_limit) {
-		IncAnimFrame();
-		return;
+	if (IsContinuous()
+			|| was_moving
+			|| data()->anim_frame == 0 || data()->anim_frame == 2
+			|| GetAnimCount() < stationary_limit) {
+		IncAnimCount();
 	}
 
-	if (GetAnimCount() >= stationary_limit) {
-		if (was_moving) {
-			IncAnimFrame();
-			return;
-		} else if (!IsContinuous() && (data()->anim_frame == 1 || data()->anim_frame == 3)) {
-			return;
-		}
+	if (GetAnimCount() > continuous_limit
+			|| (was_moving && GetAnimCount() > stationary_limit)) {
+		IncAnimFrame();
+		return;
 	}
-
-	IncAnimCount();
 }
 
 void Game_Character::UpdateJump() {

src/game_vehicle.cpp

@@ -265,10 +265,10 @@ void Game_Vehicle::UpdateAnimationAirship() {
 	if (IsAboard()) {
 		const auto limit = 11;
 
-		if (GetAnimCount() >= limit) {
+		IncAnimCount();
+
+		if (GetAnimCount() > limit) {
 			IncAnimFrame();
-		} else {
-			IncAnimCount();
 		}
 	} else {
 		ResetAnimation();
@@ -278,10 +278,10 @@ void Game_Vehicle::UpdateAnimationAirship() {
 void Game_Vehicle::UpdateAnimationShip() {
 	const auto limit = 15;
 
-	if (GetAnimCount() >= limit) {
+	IncAnimCount();
+
+	if (GetAnimCount() > limit) {
 		IncAnimFrame();
-	} else {
-		IncAnimCount();
 	}
 }