[Scummvm-cvs-logs] scummvm master -> 9cc4c42024080652d7f5cb9bd3039aed47c623d6

[lordhoto]

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:
9cc4c42024 KYRA: Extend HACK to select CD audio for Kyra2 TOWNS.


Commit: 9cc4c42024080652d7f5cb9bd3039aed47c623d6
    https://github.com/scummvm/scummvm/commit/9cc4c42024080652d7f5cb9bd3039aed47c623d6
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-04-18T23:58:22+02:00

Commit Message:
KYRA: Extend HACK to select CD audio for Kyra2 TOWNS.

Formerly we only checked track1.$EXT but we also support track01.$EXT. Guess
this is a good example why we need to reconsider how we will handle detection
of presense of CD audio tracks in general...

Changed paths:
    engines/kyra/sound_towns.cpp



diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 10cbc49..725deda 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -538,7 +538,8 @@ bool SoundTownsPC98_v2::init() {
 		// check if we have access to CD audio.
 		Resource *r = _vm->resource();
 		if (_musicEnabled &&
-			(r->exists("track1.mp3") || r->exists("track1.ogg") || r->exists("track1.flac") || r->exists("track1.fla")))
+		    (r->exists("track1.mp3") || r->exists("track1.ogg") || r->exists("track1.flac") || r->exists("track1.fla")
+		     || r->exists("track01.mp3") || r->exists("track01.ogg") || r->exists("track01.flac") || r->exists("track01.fla")))
 				_musicEnabled = 2;
 		else
 			_musicEnabled = 1;