Merged the FSNode branch with trunk r27031:27680

svn-id: r27681

3 files changed, 16 insertions, 11 deletions

diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index da0855e1a3..3bc2f3e5d7 100644
--- a/engines/scumm/he/animation_he.cpp
+++ b/engines/scumm/he/animation_he.cpp
@@ -40,7 +40,7 @@ MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer)
 }
 
 int MoviePlayer::getImageNum() {
-	if (!_fd.isOpen())
+	if (!_fd)
 		return 0;
 	return _wizResNum;
 }
@@ -48,7 +48,7 @@ int MoviePlayer::getImageNum() {
 int MoviePlayer::load(const char *filename, int flags, int image) {
 	char videoName[100];
 
-	if (_fd.isOpen()) {
+	if (_fd) {
 		closeFile();
 	}
 
@@ -66,7 +66,7 @@ int MoviePlayer::load(const char *filename, int flags, int image) {
 	debug(1, "Playing video %s", videoName);
 
 	// Skip sound tag
-	_fd.readUint32BE();
+	_fd->readUint32BE();
 
 	if (flags & 2) {
 		_vm->_wiz->createWizEmptyImage(image, 0, 0, _width, _height);
@@ -85,7 +85,7 @@ int MoviePlayer::load(const char *filename, int flags, int image) {
 }
 
 void MoviePlayer::handleNextFrame() {
-	if (_fd.isOpen() == false) {
+	if (_fd == false) {
 		return;
 	}
 
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 29226cd939..baee2f3e49 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -1090,7 +1090,7 @@ void ScummEngine_v60he::o60_readFile() {
 	int val;
 
 	// Fatty Bear uses positive values
-	if ((_game.platform == Common::kPlatformPC) && (_game.id == GID_FBEAR))
+	if (_game.platform == Common::kPlatformPC && _game.id == GID_FBEAR)
 		size = -size;
 
 	assert(_hInFileTable[slot]);
@@ -1120,7 +1120,7 @@ void ScummEngine_v60he::o60_writeFile() {
 	int slot = pop();
 
 	// Fatty Bear uses positive values
-	if ((_game.platform == Common::kPlatformPC) && (_game.id == GID_FBEAR))
+	if (_game.platform == Common::kPlatformPC && _game.id == GID_FBEAR)
 		size = -size;
 
 	assert(_hOutFileTable[slot]);
@@ -1138,13 +1138,15 @@ void ScummEngine_v60he::o60_soundOps() {
 	int arg = pop();
 
 	switch (subOp) {
-	case 0xde:
-		_imuse->setMusicVolume(arg);
+	case 222:
+		if (_imuse) {
+			_imuse->setMusicVolume(arg);
+		}
 		break;
-	case 0xdf:
-		// Used in fbear introduction
+	case 223:
+		// WORKAROUND: For error in room script 228 (room 2) of fbear.
 		break;
-	case 0xe0:
+	case 224:
 		// Fatty Bear's Birthday surprise uses this when playing the
 		// piano, but only when using one of the digitized instruments.
 		// See also o6_startSound().
diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp
index 6b1f670e15..1ced349225 100644
--- a/engines/scumm/he/script_v70he.cpp
+++ b/engines/scumm/he/script_v70he.cpp
@@ -461,6 +461,9 @@ void ScummEngine_v70he::o70_startSound() {
 	case 164:
 		_heSndFlags |= 2;
 		break;
+	case 222:
+		// WORKAROUND: For errors in room script 240 (room 4) of maze
+		break;
 	case 224:
 		_heSndSoundFreq = pop();
 		break;