[Scummvm-git-logs] scummvm master -> f2d80f4ae3bf2b529aa0af57b45c0023dfbf12e2

[dreammaster]

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

Summary:
f2d80f4ae3 XEEN: Fix voice playback in World of Xeen Darkside


Commit: f2d80f4ae3bf2b529aa0af57b45c0023dfbf12e2
    https://github.com/scummvm/scummvm/commit/f2d80f4ae3bf2b529aa0af57b45c0023dfbf12e2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-05-05T11:58:33-04:00

Commit Message:
XEEN: Fix voice playback in World of Xeen Darkside

Changed paths:
    README
    engines/xeen/scripts.cpp


diff --git a/README b/README
index 3ee554d..d9804ef 100644
--- a/README
+++ b/README
@@ -927,14 +927,11 @@ is simpler and more straightforward than moving around using the menu.
 
 3.15 Might and Magic Xeen games notes:
 --------------------------------------
-To properly plan the World of Xeen CD Talkie using original discs,
-use LAME or some other MP3 encoder to rip the cd audio tracks to files.
-Name the files track2.mp3 track3.mp3 etc. ScummVM must be compiled with
-MAD support to use this option. You will need to rip the file from the
-CD as a WAV file, then encode the MP3 files in constant bit rate. This
-can be done for each track with a LAME command line like:
-
-  lame -t -q 0 -b 96 track2.wav track2.mp3
+To properly play the World of Xeen CD Talkie using original discs,
+use LAME or some other encoder to rip the cd audio tracks to files,
+either mp3 or ogg. Whichever you choose, the tracks of the first CD
+should be named from track02 to track29, whereas the second CD's
+audio tracks should be encoded as track30 through to track60.
 
 For the GOG Might and Magic 4-5 installation, install the game to your
 computer, and do the following steps:
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 32f6ae9..a023fe5 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1475,6 +1475,8 @@ bool Scripts::cmdPlayCD(ParamsIterator &params) {
 	int trackNum = params.readByte();
 	int start = params.readUint16LE() * 60 / 75;
 	int finish = params.readUint16LE() * 60 / 75;
+	if (_vm->_files->_ccNum)
+		trackNum += 30;
 
 	g_system->getAudioCDManager()->play(trackNum, 1, start, finish - start, false, Audio::Mixer::kSpeechSoundType);
 	return true;