Fixed running sound looping infinitely after running into map change

3 files changed, 14 insertions, 4 deletions

@@ -238,3 +238,11 @@ void CharacterSystem::stopRunningSound(Sprite& sprite) {
     sprite.runningSfxChannel = -1;
   }
 }
+
+void CharacterSystem::clearSpriteCache() {
+  for (Sprite& sprite : game_.getSprites() | game_.spriteView()) {
+    if (sprite.runningSfxChannel != -1) {
+      stopRunningSound(sprite);
+    }
+  }
+}
@@ -31,6 +31,8 @@ public:
 
   void endCrouch(int spriteId);
 
+  void clearSpriteCache() override;
+
 private:
 
   void stopRunning(int spriteId);
@@ -13,13 +13,13 @@ int Game::emplaceSprite(std::string alias) {
 }
 
 void Game::clearSprites() {
-  sprites_.clear();
-  spriteIds_.clear();
-  spritesByAlias_.clear();
-
   for (std::unique_ptr<System>& system : systems_) {
     system->clearSpriteCache();
   }
+
+  sprites_.clear();
+  spriteIds_.clear();
+  spritesByAlias_.clear();
 }
 
 void Game::loadMap(std::string filename, std::string warpPoint) {