From 510eb83aaccd4460887881bd373e403a4d0917cf Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 21 Mar 2013 07:19:10 +0100
Subject: HOPKINS: Simplify a couple of tests in SoundManager

---
 engines/hopkins/sound.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'engines/hopkins')

diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index b64430fae2..1605b0350e 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -732,10 +732,8 @@ void SoundManager::stopVoice(int voiceIndex) {
 	if (_voice[voiceIndex]._status) {
 		_voice[voiceIndex]._status = false;
 		int wavIndex = _voice[voiceIndex]._wavIndex;
-		if (_sWav[wavIndex]._active) {
-			if (_sWav[wavIndex]._freeSampleFl)
-				removeWavSample(wavIndex);
-		}
+		if (_sWav[wavIndex]._active && _sWav[wavIndex]._freeSampleFl)
+			removeWavSample(wavIndex);
 	}
 	_voice[voiceIndex]._status = false;
 }
@@ -802,21 +800,23 @@ void SoundManager::loadWav(const Common::String &file, int wavIndex) {
 }
 
 void SoundManager::playWav(int wavIndex) {
-	if (!_soundFl && !_soundOffFl) {
-		_soundFl = true;
-		_currentSoundIndex = wavIndex;
-		playWavSample(1, wavIndex);
-	}
+	if (_soundFl || _soundOffFl)
+		return;
+
+	_soundFl = true;
+	_currentSoundIndex = wavIndex;
+	playWavSample(1, wavIndex);
 }
 
 void SoundManager::delWav(int wavIndex) {
-	if (removeWavSample(wavIndex)) {
-		if (checkVoiceStatus(1))
-			stopVoice(1);
+	if (!removeWavSample(wavIndex))
+		return;
 
-		_currentSoundIndex = 0;
-		_soundFl = false;
-	}
+	if (checkVoiceStatus(1))
+		stopVoice(1);
+
+	_currentSoundIndex = 0;
+	_soundFl = false;
 }
 
 void SoundManager::playWavSample(int voiceIndex, int wavIndex) {
-- 
cgit v1.2.3