SHERLOCK: Fix some remaining TODOs

4 files changed, 8 insertions, 4 deletions

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index c714574e08..e69fb49766 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1127,9 +1127,7 @@ void Scene::doBgAnim() {
 
 	if (sound._diskSoundPlaying && !*sound._soundIsOn) {
 		// Loaded sound just finished playing
-		// TODO: This is horrible.. refactor into the Sound class
-		delete[] sound._digiBuf;
-		sound._diskSoundPlaying = false;
+		sound.freeDigiSound();
 	}
 
 	if (_restoreFlag) {
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 1a6472a9e9..a452efd890 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -99,4 +99,10 @@ void Sound::waitTimerRoland(uint time) {
 	// TODO
 }
 
+void Sound::freeDigiSound() {
+	delete[] _digiBuf;
+	_digiBuf = nullptr;
+	_diskSoundPlaying = false;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 28de692109..c85af2ac2a 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -67,6 +67,7 @@ public:
 	void stopMusic();
 	void stopSndFuncPtr(int v1, int v2);
 	void waitTimerRoland(uint time);
+	void freeDigiSound();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index f60e63a574..21a53c32ff 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2019,7 +2019,6 @@ void UserInterface::journalControl() {
 	screen._backBuffer1.blitFrom(screen._backBuffer2);
 	scene.updateBackground();
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	// TODO
 }
 
 /**