Fixed a regression in the LSL1 and LSL5 demos, which should work correctly now. Some cleanup

svn-id: r46020

2 files changed, 2 insertions, 11 deletions

diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp
index b425c26379..ec90d49c4e 100644
--- a/engines/sci/sfx/soundcmd.cpp
+++ b/engines/sci/sfx/soundcmd.cpp
@@ -247,11 +247,8 @@ void SoundCommandParser::cmdInitHandle(reg_t obj, SongHandle handle, int value)
 		}
 	}
 
-	// Some games try to init non-existing sounds (e.g. KQ6)
-	if (_doSoundVersion == SCI_VERSION_1_LATE) {
-		if (!obj.segment || !_resMan->testResource(ResourceId(kResourceTypeSound, number)))
-			return;
-	}
+	if (!obj.segment || !_resMan->testResource(ResourceId(kResourceTypeSound, number)))
+		return;
 
 	_state->sfx_add_song(build_iterator(_resMan, number, type, handle), 0, handle, number);
 
@@ -416,11 +413,6 @@ void SoundCommandParser::cmdVolume(reg_t obj, SongHandle handle, int value) {
 	_acc = make_reg(0, _state->sfx_getVolume());
 }
 
-void SoundCommandParser::cmdHandlePriority(reg_t obj, SongHandle handle, int value) {
-	if (obj.segment)
-		script_set_priority(_resMan, _segMan, _state, obj, GET_SEL32V(_segMan, obj, pri));
-}
-
 void SoundCommandParser::cmdFadeHandle(reg_t obj, SongHandle handle, int value) {
 	if (!obj.segment)
 		return;
diff --git a/engines/sci/sfx/soundcmd.h b/engines/sci/sfx/soundcmd.h
index 9e4db733e0..0a4e47512f 100644
--- a/engines/sci/sfx/soundcmd.h
+++ b/engines/sci/sfx/soundcmd.h
@@ -73,7 +73,6 @@ private:
 	void cmdStopHandle(reg_t obj, SongHandle handle, int value);
 	void cmdDisposeHandle(reg_t obj, SongHandle handle, int value);
 	void cmdVolume(reg_t obj, SongHandle handle, int value);
-	void cmdHandlePriority(reg_t obj, SongHandle handle, int value);
 	void cmdFadeHandle(reg_t obj, SongHandle handle, int value);
 	void cmdGetPolyphony(reg_t obj, SongHandle handle, int value);
 	void cmdGetPlayNext(reg_t obj, SongHandle handle, int value);