[Scummvm-cvs-logs] SF.net SVN: scummvm:[46020] scummvm/trunk/engines/sci/sfx

[thebluegr at users.sourceforge.net]

Revision: 46020
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46020&view=rev
Author:   thebluegr
Date:     2009-11-20 20:32:25 +0000 (Fri, 20 Nov 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/soundcmd.cpp
    scummvm/trunk/engines/sci/sfx/soundcmd.h

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-11-20 20:30:31 UTC (rev 46019)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-11-20 20:32:25 UTC (rev 46020)
@@ -247,11 +247,8 @@
 		}
 	}
 
-	// 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 @@
 	_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;

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.h	2009-11-20 20:30:31 UTC (rev 46019)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.h	2009-11-20 20:32:25 UTC (rev 46020)
@@ -73,7 +73,6 @@
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.