diff options
| author | Max Horn | 2006-02-20 16:51:30 +0000 |
|---|---|---|
| committer | Max Horn | 2006-02-20 16:51:30 +0000 |
| commit | e389bcf497391cf4cde7d7b7a6f4023877205735 (patch) | |
| tree | b8314b1ad8bc19117c37df4d4ce27d9cce92a442 /engines/scumm/imuse_digi/dimuse_script.cpp | |
| parent | a6e5f6fd2cdb574e09fb3bd120b1e8efa034f0cb (diff) | |
| download | scummvm-rg350-e389bcf497391cf4cde7d7b7a6f4023877205735.tar.gz scummvm-rg350-e389bcf497391cf4cde7d7b7a6f4023877205735.tar.bz2 scummvm-rg350-e389bcf497391cf4cde7d7b7a6f4023877205735.zip | |
Replaced _gameId, _version, _heversion, _features, _midi, _platform with a simple ScummGameSettings instance: _game
svn-id: r20795
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse_script.cpp')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_script.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp index 83deb91e54..0feecd122f 100644 --- a/engines/scumm/imuse_digi/dimuse_script.cpp +++ b/engines/scumm/imuse_digi/dimuse_script.cpp @@ -87,7 +87,7 @@ void IMuseDigital::parseScriptCmds(int cmd, int b, int c, int d, int e, int f, i break; case 0x1000: // ImuseSetState debug(5, "ImuseSetState (%d)", b); - if ((_vm->_gameId == GID_DIG) && (_vm->_features & GF_DEMO)) { + if ((_vm->_game.id == GID_DIG) && (_vm->_game.features & GF_DEMO)) { if (b == 1) { fadeOutMusic(200); startMusic(1, 127); @@ -97,7 +97,7 @@ void IMuseDigital::parseScriptCmds(int cmd, int b, int c, int d, int e, int f, i startMusic(2, 127); } } - } else if ((_vm->_gameId == GID_CMI) && (_vm->_features & GF_DEMO)) { + } else if ((_vm->_game.id == GID_CMI) && (_vm->_game.features & GF_DEMO)) { fadeOutMusic(120); if (b == 2) { startMusic("in1.imx", 1100, 0, 127); @@ -112,34 +112,34 @@ void IMuseDigital::parseScriptCmds(int cmd, int b, int c, int d, int e, int f, i } else { warning("imuse digital: set state unknown for cmi demo: %d, room: %d", b, _vm->_currentRoom); } - } else if (_vm->_gameId == GID_DIG) { + } else if (_vm->_game.id == GID_DIG) { setDigMusicState(b); - } else if (_vm->_gameId == GID_CMI) { + } else if (_vm->_game.id == GID_CMI) { setComiMusicState(b); - } else if (_vm->_gameId == GID_FT) { + } else if (_vm->_game.id == GID_FT) { setFtMusicState(b); } break; case 0x1001: // ImuseSetSequence debug(5, "ImuseSetSequence (%d)", b); - if (_vm->_gameId == GID_DIG) { + if (_vm->_game.id == GID_DIG) { setDigMusicSequence(b); - } else if (_vm->_gameId == GID_CMI) { + } else if (_vm->_game.id == GID_CMI) { setComiMusicSequence(b); - } else if (_vm->_gameId == GID_FT) { + } else if (_vm->_game.id == GID_FT) { setFtMusicSequence(b); } break; case 0x1002: // ImuseSetCuePoint debug(5, "ImuseSetCuePoint (%d)", b); - if (_vm->_gameId == GID_FT) { + if (_vm->_game.id == GID_FT) { setFtMusicCuePoint(b); } break; case 0x1003: // ImuseSetAttribute debug(5, "ImuseSetAttribute (%d, %d)", b, c); - assert((_vm->_gameId == GID_DIG) || (_vm->_gameId == GID_FT)); - if (_vm->_gameId == GID_DIG) { + assert((_vm->_game.id == GID_DIG) || (_vm->_game.id == GID_FT)); + if (_vm->_game.id == GID_DIG) { _attributes[b] = c; } break; |