From 135e71d650e5a414219729cd84a2c917a3e8f1fb Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 24 Feb 2021 10:12:18 -0500
Subject: Removed manual animation stuff

---
 src/animation_system.cpp | 15 ---------------
 src/animation_system.h   |  3 ---
 src/character_system.cpp |  2 +-
 src/sprite.h             |  1 -
 4 files changed, 1 insertion(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/animation_system.cpp b/src/animation_system.cpp
index a280aee..2c2c6a5 100644
--- a/src/animation_system.cpp
+++ b/src/animation_system.cpp
@@ -78,8 +78,6 @@ void AnimationSystem::initSprite(int spriteId, std::string_view filename) {
 
     if (animName.back() == '!') {
       anim.looping = false;
-    } else if (animName.back() == '.') {
-      anim.manual = true;
     }
 
     int animId = sprite.animations.size();
@@ -114,19 +112,6 @@ void AnimationSystem::tick(double dt) {
   }
 }
 
-void AnimationSystem::advanceAnimation(int spriteId) {
-  Sprite& sprite = game_.getSprite(spriteId);
-  Animation& animation = sprite.animations[sprite.animationId];
-
-  if (animation.manual) {
-    sprite.animationFrame++;
-
-    if (sprite.animationFrame >= animation.frameIndices.size()) {
-      sprite.animationFrame = 0;
-    }
-  }
-}
-
 void AnimationSystem::setSpriteDirection(int spriteId, Direction dir) {
   Sprite& sprite = game_.getSprite(spriteId);
   if (sprite.dir != dir) {
diff --git a/src/animation_system.h b/src/animation_system.h
index 8352c19..a116673 100644
--- a/src/animation_system.h
+++ b/src/animation_system.h
@@ -17,9 +17,6 @@ public:
 
   void tick(double dt) override;
 
-  // Advances animation by a frame. Only to be used on manual animations.
-  void advanceAnimation(int spriteId);
-
   void initSprite(int spriteId, std::string_view filename);
 
   void setSpriteDirection(int spriteId, Direction dir);
diff --git a/src/character_system.cpp b/src/character_system.cpp
index 27c2280..ea469d5 100644
--- a/src/character_system.cpp
+++ b/src/character_system.cpp
@@ -349,7 +349,7 @@ void CharacterSystem::setAnimationFor(int spriteId, CharacterState state) {
       break;
     }
     case CharacterMedium::Ladder: {
-      game_.getSystem<AnimationSystem>().setSpriteAnimation(spriteId, "climb.");
+      game_.getSystem<AnimationSystem>().setSpriteAnimation(spriteId, "climb");
 
       if (state == CharacterState::Still || state == CharacterState::Crouching) {
         sprite.animPaused = true;
diff --git a/src/sprite.h b/src/sprite.h
index 59d2caf..5750308 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -23,7 +23,6 @@ struct SpriteFrame {
 
 struct Animation {
   bool looping = true;
-  bool manual = false;
   std::vector<int> frameIndices;
 };
 
-- 
cgit 1.4.1