1 files changed, 5 insertions, 14 deletions

@@ -38,12 +38,7 @@ Sprite::Sprite(std::string_view filename, Renderer& renderer) {
     animations_.push_back(std::move(frames));
 
     Direction dir = directionFromString(std::string(m[2]));
-
-    if (m[1] == "still") {
-      stillAnims_[dir] = animId;
-    } else {
-      walkingAnims_[dir] = animId;
-    }
+    stateDirToAnim_[m[1]][dir] = animId;
   }
 
   updateAnimation();
@@ -56,19 +51,15 @@ void Sprite::setDirection(Direction dir) {
   }
 }
 
-void Sprite::setWalking(bool walking) {
-  if (isWalking_ != walking) {
-    isWalking_ = walking;
+void Sprite::setState(std::string state) {
+  if (state_ != state) {
+    state_ = state;
     updateAnimation();
   }
 }
 
 void Sprite::updateAnimation() {
-  if (isWalking_) {
-    curAnim_ = walkingAnims_[curDir_];
-  } else {
-    curAnim_ = stillAnims_[curDir_];
-  }
+  curAnim_ = stateDirToAnim_[state_][curDir_];
   curFrame_ = 0;
 }