Replaced _gameId, _version, _heversion, _features, _midi, _platform with a simple ScummGameSettings instance: _game

svn-id: r20795

2 files changed, 19 insertions, 19 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;
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 6adef74ab7..61d625ec0a 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -273,8 +273,8 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) {
 
 	sound->bundle = new BundleMgr(_cacheBundleDir);
 	assert(sound->bundle);
-	if (_vm->_gameId == GID_CMI) {
-		if (_vm->_features & GF_DEMO) {
+	if (_vm->_game.id == GID_CMI) {
+		if (_vm->_game.features & GF_DEMO) {
 			result = sound->bundle->open("music.bun", sound->compressed);
 		} else {
 			char musicfile[20];
@@ -293,7 +293,7 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) {
 			// FIXME: Shouldn't we only set _disk if result == true?
 			_disk = (byte)_vm->VAR(_vm->VAR_CURRENTDISK);
 		}
-	} else if (_vm->_gameId == GID_DIG)
+	} else if (_vm->_game.id == GID_DIG)
 		result = sound->bundle->open("digmusic.bun", sound->compressed, true);
 	else
 		error("ImuseDigiSndMgr::openMusicBundle() Don't know which bundle file to load");
@@ -308,8 +308,8 @@ bool ImuseDigiSndMgr::openVoiceBundle(soundStruct *sound, int disk) {
 
 	sound->bundle = new BundleMgr(_cacheBundleDir);
 	assert(sound->bundle);
-	if (_vm->_gameId == GID_CMI) {
-		if (_vm->_features & GF_DEMO) {
+	if (_vm->_game.id == GID_CMI) {
+		if (_vm->_game.features & GF_DEMO) {
 			result = sound->bundle->open("voice.bun", sound->compressed);
 		} else {
 			char voxfile[20];
@@ -328,7 +328,7 @@ bool ImuseDigiSndMgr::openVoiceBundle(soundStruct *sound, int disk) {
 			// FIXME: Shouldn't we only set _disk if result == true?
 			_disk = (byte)_vm->VAR(_vm->VAR_CURRENTDISK);
 		}
-	} else if (_vm->_gameId == GID_DIG)
+	} else if (_vm->_game.id == GID_DIG)
 		result = sound->bundle->open("digvoice.bun", sound->compressed);
 	else
 		error("ImuseDigiSndMgr::openVoiceBundle() Don't know which bundle file to load");
@@ -347,7 +347,7 @@ ImuseDigiSndMgr::soundStruct *ImuseDigiSndMgr::openSound(int32 soundId, const ch
 		error("ImuseDigiSndMgr::openSound() can't alloc free sound slot");
 	}
 
-	const bool header_outside = ((_vm->_gameId == GID_CMI) && !(_vm->_features & GF_DEMO));
+	const bool header_outside = ((_vm->_game.id == GID_CMI) && !(_vm->_game.features & GF_DEMO));
 	bool result = false;
 	byte *ptr = NULL;
 
@@ -579,7 +579,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b
 	}
 
 	int header_size = soundHandle->offsetData;
-	bool header_outside = ((_vm->_gameId == GID_CMI) && !(_vm->_features & GF_DEMO));
+	bool header_outside = ((_vm->_game.id == GID_CMI) && !(_vm->_game.features & GF_DEMO));
 	if ((soundHandle->bundle) && (!soundHandle->compressed)) {
 		size = soundHandle->bundle->decompressSampleByCurIndex(start + offset, size, buf, header_size, header_outside);
 	} else if (soundHandle->resPtr) {