diff options
| author | Max Horn | 2006-04-29 13:56:36 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-29 13:56:36 +0000 |
| commit | 39e9853d91a88c9659036ec6dc903d48a000e93c (patch) | |
| tree | 4a459db79677e0ede89ca1621d9904b19e458a56 /engines/scumm/scumm.cpp | |
| parent | daed55b789c1dfa8ad0261da3fe97ee2b64db889 (diff) | |
| download | scummvm-rg350-39e9853d91a88c9659036ec6dc903d48a000e93c.tar.gz scummvm-rg350-39e9853d91a88c9659036ec6dc903d48a000e93c.tar.bz2 scummvm-rg350-39e9853d91a88c9659036ec6dc903d48a000e93c.zip | |
* Added ScummEngine_v8::initScummVars()
* Moved VAR_LANGUAGE to class ScummEngine_v8
* Minor cleanup
svn-id: r22223
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index c6fc1a04b6..e380f9d313 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -434,7 +434,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) // // Init all VARS to 0xFF // - VAR_LANGUAGE = 0xFF; VAR_KEYPRESS = 0xFF; VAR_SYNC = 0xFF; VAR_EGO = 0xFF; @@ -923,6 +922,8 @@ ScummEngine_v7::~ScummEngine_v7() { ScummEngine_v8::ScummEngine_v8(OSystem *syst, const DetectorResult &dr) : ScummEngine_v7(syst, dr) { _objectIDMap = 0; + + VAR_LANGUAGE = 0xFF; } ScummEngine_v8::~ScummEngine_v8() { @@ -955,12 +956,13 @@ int ScummEngine::init() { _system->endGFXTransaction(); // On some systems it's not safe to run CD audio games from the CD. - if (_game.features & GF_AUDIOTRACKS) + if (_game.features & GF_AUDIOTRACKS) { checkCD(); - - int cd_num = ConfMan.getInt("cdrom"); - if (cd_num >= 0 && (_game.features & GF_AUDIOTRACKS)) - _system->openCD(cd_num); + + int cd_num = ConfMan.getInt("cdrom"); + if (cd_num >= 0) + _system->openCD(cd_num); + } // Create the sound manager if (_game.heversion > 0) |