diff options
| author | Max Horn | 2002-09-28 15:19:21 +0000 |
|---|---|---|
| committer | Max Horn | 2002-09-28 15:19:21 +0000 |
| commit | a8d77fabee4e32e6d964942e17ad10587ea461e5 (patch) | |
| tree | 2e54e044c667f9945f722d98849ce56994edfaa6 | |
| parent | 4e0b50722bfdb56fbfe8dcbeebbe2d8ebd8873e0 (diff) | |
| download | scummvm-rg350-a8d77fabee4e32e6d964942e17ad10587ea461e5.tar.gz scummvm-rg350-a8d77fabee4e32e6d964942e17ad10587ea461e5.tar.bz2 scummvm-rg350-a8d77fabee4e32e6d964942e17ad10587ea461e5.zip | |
patch #615842
svn-id: r5027
| -rw-r--r-- | scumm/scumm.h | 1 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index d034ad6789..6b7298b344 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -957,7 +957,6 @@ public: char transText[200]; bool checkFixedDisk(); - int _cdrom; #if defined(SCUMM_LITTLE_ENDIAN) uint32 fileReadDword() { return _fileHandle.readDwordLE(); } diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index a218ddeb43..0d3b2898c7 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -87,7 +87,6 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _features = detector->_features; _soundCardType = detector->_soundCardType; _noSubtitles = detector->_noSubtitles; - _cdrom = detector->_cdrom; _defaultTalkDelay = detector->_talkSpeed; _use_adlib = detector->_use_adlib; @@ -117,7 +116,8 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) /* Initialize backend */ syst->init_size(_realWidth, _realHeight); prop.cd_num = detector->_cdrom; - syst->property(OSystem::PROP_OPEN_CD, &prop); + if (prop.cd_num >= 0) + syst->property(OSystem::PROP_OPEN_CD, &prop); /* Bind the mixer to the system => mixer will be invoked * automatically when samples need to be generated */ |