From e389bcf497391cf4cde7d7b7a6f4023877205735 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 20 Feb 2006 16:51:30 +0000
Subject: Replaced _gameId, _version, _heversion, _features, _midi, _platform
 with a simple ScummGameSettings instance: _game

svn-id: r20795
---
 engines/scumm/he/sound_he.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/scumm/he/sound_he.cpp')

diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 5ed135cd8a..d687844d9d 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -114,7 +114,7 @@ int Sound::getSoundPos(int sound) {
 }
 
 int Sound::getSoundVar(int sound, int var) {
-	if (_vm->_heversion >= 90 && var == 26) {
+	if (_vm->_game.heversion >= 90 && var == 26) {
 		return isSoundCodeUsed(sound);
 	}
 
@@ -171,7 +171,7 @@ void Sound::setupHEMusicFile() {
 		_heMusicTracks = musicFile.readUint32LE();
 		debug(5, "Total music tracks %d", _heMusicTracks);
 
-		int musicStart = (_vm->_heversion >= 80) ? 56 : 20;
+		int musicStart = (_vm->_game.heversion >= 80) ? 56 : 20;
 		musicFile.seek(musicStart, SEEK_SET);
 
 		_heMusic = (HEMusic *)malloc((_heMusicTracks + 1) * sizeof(HEMusic));
@@ -180,7 +180,7 @@ void Sound::setupHEMusicFile() {
 			_heMusic[i].offset = musicFile.readUint32LE();
 			_heMusic[i].size = musicFile.readUint32LE();
 
-			if (_vm->_heversion >= 80) {
+			if (_vm->_game.heversion >= 80) {
 				musicFile.seek(+9, SEEK_CUR);
 			} else {
 				musicFile.seek(+13, SEEK_CUR);
@@ -373,7 +373,7 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
 		musicFile.read(spoolPtr, size);
 		musicFile.close();
 
-		if (_vm->_heversion == 70) {
+		if (_vm->_game.heversion == 70) {
 			_vm->_mixer->playRaw(&_heSoundChannels[heChannel], spoolPtr, size, 11025, flags, soundID);
 			return;
 		}
-- 
cgit v1.2.3