aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-06-14 08:54:11 +0000
committerTorbjörn Andersson2005-06-14 08:54:11 +0000
commitdc3372b5804b61f5e213ccbfd98c8847fd5f10cf (patch)
treea63b6c5dfafe4c4d042304d98ed996ee5fa56e8c /scumm
parent962e716a5272bd627ec4f823310f57a26699ba32 (diff)
downloadscummvm-rg350-dc3372b5804b61f5e213ccbfd98c8847fd5f10cf.tar.gz
scummvm-rg350-dc3372b5804b61f5e213ccbfd98c8847fd5f10cf.tar.bz2
scummvm-rg350-dc3372b5804b61f5e213ccbfd98c8847fd5f10cf.zip
Applied patch #1208299. A warning message about the "playing from CD under
Windows" bug is better than nothing, even if a proper bugfix - if one is possible - would be preferable. svn-id: r18389
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scumm.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 9be88af8ea..2b05c35fbe 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1461,6 +1461,10 @@ int ScummEngine::init(GameDetector &detector) {
_system->endGFXTransaction();
+ // On some systems it's not safe to run CD audio games from the CD.
+ if (_features & GF_AUDIOTRACKS)
+ checkCD();
+
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0 && (_features & GF_AUDIOTRACKS))
_system->openCD(cd_num);