[Scummvm-git-logs] scummvm master -> 5e51ea8212d1709c1cca17f1fc2d5c5c6ca6f8a8

[sev-]

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:
5e51ea8212 DIRECTOR: cdromxobj: Subtract 1 from the CD Audio track to play


Commit: 5e51ea8212d1709c1cca17f1fc2d5c5c6ca6f8a8
    https://github.com/scummvm/scummvm/commit/5e51ea8212d1709c1cca17f1fc2d5c5c6ca6f8a8
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-10-29T00:55:55+02:00

Commit Message:
DIRECTOR: cdromxobj: Subtract 1 from the CD Audio track to play

This is based on the documentation that says to name ripped audio tracks
starting at 1 rather than their actual track index. I've seen this in
other engines that use CD audio tracks as well.

Changed paths:
    engines/director/lingo/xlibs/cdromxobj.cpp


diff --git a/engines/director/lingo/xlibs/cdromxobj.cpp b/engines/director/lingo/xlibs/cdromxobj.cpp
index 93a976ec613..a84bee5ea92 100644
--- a/engines/director/lingo/xlibs/cdromxobj.cpp
+++ b/engines/director/lingo/xlibs/cdromxobj.cpp
@@ -266,7 +266,7 @@ void CDROMXObj::m_playTrack(int nargs) {
 	CDROMXObject *me = static_cast<CDROMXObject *>(g_lingo->_state->me.u.obj);
 
 	int track = g_lingo->pop().asInt();
-	g_director->_system->getAudioCDManager()->play(track, -1, 0, 0);
+	g_director->_system->getAudioCDManager()->play(track - 1, -1, 0, 0);
 	me->_cdda_status = g_director->_system->getAudioCDManager()->getStatus();
 }
 
@@ -289,7 +289,7 @@ void CDROMXObj::m_playName(int nargs) {
 		warning("CDROMXObj::m_playName: track number failed to parse (provided string was %s)", track.c_str());
 	}
 
-	g_director->_system->getAudioCDManager()->play(trackNumI, -1, 0, 0);
+	g_director->_system->getAudioCDManager()->play(trackNumI - 1, -1, 0, 0);
 	me->_cdda_status = g_director->_system->getAudioCDManager()->getStatus();
 }