1 files changed, 6 insertions, 7 deletions

@@ -65,7 +65,7 @@ void AnimationSystem::initSprite(int spriteId, std::string_view filename) {
   std::string animLine;
   std::getline(datafile, animLine); // blank
   while (std::getline(datafile, animLine)) {
-    std::regex re(R"(([a-z!]+)\[([a-z_]+)\]: ([0-9,]+))");
+    std::regex re(R"(([a-z!_]+)\[([a-z_]+)\]: ([0-9,]+))");
     std::smatch m;
     std::regex_match(animLine, m, re);
 
@@ -96,14 +96,13 @@ void AnimationSystem::tick(double dt) {
     for (Sprite& sprite : game_.getSprites() | game_.spriteView()) {
       if (sprite.isAnimated && !sprite.animFinished) {
         sprite.animationFrame++;
-        if (sprite.animations[sprite.animationId].looping) {
-          if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size()) {
+
+        if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size()) {
+          if (sprite.animations[sprite.animationId].looping) {
             sprite.animationFrame = 0;
-          }
-        } else {
-          if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size() - 1) {
-            sprite.animationFrame = sprite.animations[sprite.animationId].frameIndices.size() - 1;
+          } else {
             sprite.animFinished = true;
+            sprite.animationFrame = sprite.animations[sprite.animationId].frameIndices.size() - 1;
           }
         }
       }