From e49a090af787faf4115f0dece1a4aee7dd0bb70d Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 17 Mar 2012 09:16:09 -0700
Subject: [PATCH] Remove unnecessary hack

---
 apps/openmw/mwsound/soundmanager.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwsound/soundmanager.cpp b/apps/openmw/mwsound/soundmanager.cpp
index 535dbe774..796c490d9 100644
--- a/apps/openmw/mwsound/soundmanager.cpp
+++ b/apps/openmw/mwsound/soundmanager.cpp
@@ -162,9 +162,15 @@ namespace MWSound
 
     bool SoundManager::isPlaying(MWWorld::Ptr ptr, const std::string &id) const
     {
-        // HACK: Return true to prevent the engine from trying to keep playing
-        // sounds and tanking the framerate.
-        return true;
+        SoundMap::const_iterator snditer = ActiveSounds.find(ptr);
+        if(snditer == ActiveSounds.end())
+            return false;
+
+        IDMap::const_iterator iditer = snditer->second.find(id);
+        if(iditer == snditer->second.end())
+            return false;
+
+        return iditer->second->isPlaying();
     }
 
     // Remove all references to objects belonging to a given cell