From e20f65e5ea3eac8420fc5b54e5ad64d538b98148 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 5 Jan 2017 02:06:50 -0800
Subject: CRYO: Get rid of sound's locked and forcewait, remove some dead code,
 renaming

---
 engines/cryo/sound.cpp | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'engines/cryo/sound.cpp')

diff --git a/engines/cryo/sound.cpp b/engines/cryo/sound.cpp
index 279e237454..bb2816870d 100644
--- a/engines/cryo/sound.cpp
+++ b/engines/cryo/sound.cpp
@@ -82,7 +82,6 @@ SoundGroup::SoundGroup(CryoEngine *vm, int16 numSounds, int16 length, int16 samp
 	}
 	_soundIndex = 0;
 	_playIndex = 0;
-	_forceWait = true;
 }
 
 // Original name: CLSoundGroup_Free
@@ -100,19 +99,12 @@ void SoundGroup::reverse16All() {
 // Original name: CLSoundGroup_GetNextBuffer
 void *SoundGroup::getNextBuffer() {
 	Sound *sound = _sounds[_soundIndex];
-	if (_forceWait)
-		while (sound->_locked) ;
 	return sound->_sndHandle + sound->_headerLen;
 }
 
 // Original name: CLSoundGroup_AssignDatas
 bool SoundGroup::assignDatas(void *buffer, int length, bool isSigned) {
 	Sound *sound = _sounds[_soundIndex];
-	if (_forceWait)
-		while (sound->_locked)
-			;
-	else if (sound->_locked)
-		return false;
 
 	sound->_buffer = (char *)buffer;
 	sound->setLength(length);
@@ -135,11 +127,6 @@ bool SoundGroup::setDatas(void *data, int length, bool isSigned) {
 	if (length >= sound->_maxLength)
 		error("CLSoundGroup_SetDatas - Unexpected length");
 
-	if (_forceWait)
-		while (sound->_locked) ;
-	else if (sound->_locked)
-		return false;
-
 	void *buffer = sound->_sndHandle + sound->_headerLen;
 	sound->_buffer = (char *)buffer;
 	memcpy(buffer, data, length);
-- 
cgit v1.2.3