[Scummvm-git-logs] scummvm master -> 82296866b4f79798d1fd5085bfd91fa2fb829d6a

dreammaster dreammaster at scummvm.org
Wed May 9 01:42:36 CEST 2018


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ccc4ec963f XEEN: Fix voice playback from track 31
82296866b4 Merge pull request #1186 from kurisuke/fix/worldofxeen_track31


Commit: ccc4ec963fad5f69f2b303b60e0fe611b19b7892
    https://github.com/scummvm/scummvm/commit/ccc4ec963fad5f69f2b303b60e0fe611b19b7892
Author: Peter Helbing (peter at abulafia.org)
Date: 2018-05-08T20:28:29+09:00

Commit Message:
XEEN: Fix voice playback from track 31

Track 31 is on the first cd, but contains speech for Darkside content
(e.g. Ellinger). It is referenced as track 31, so the offset must not
be added.

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index a243951..ee55ffe 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1478,7 +1478,7 @@ bool Scripts::cmdPlayCD(ParamsIterator &params) {
 	int finish = params.readUint16LE();
 	debugC(3, kDebugScripts, "cmdPlayCD Track=%d start=%d finish=%d", trackNum, start, finish);
 
-	if (_vm->_files->_ccNum)
+	if (_vm->_files->_ccNum && trackNum < 31)
 		trackNum += 30;
 	assert(trackNum <= 60);
 


Commit: 82296866b4f79798d1fd5085bfd91fa2fb829d6a
    https://github.com/scummvm/scummvm/commit/82296866b4f79798d1fd5085bfd91fa2fb829d6a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-05-08T19:42:30-04:00

Commit Message:
Merge pull request #1186 from kurisuke/fix/worldofxeen_track31

XEEN: Fix voice playback from track 31

Changed paths:
    engines/xeen/scripts.cpp







More information about the Scummvm-git-logs mailing list