[Scummvm-cvs-logs] scummvm master -> 834955959802dce12286bbeed3e5f628a3236c86

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8349559598 MORTEVIELLE: Fix loading of BRUITS file


Commit: 834955959802dce12286bbeed3e5f628a3236c86
    https://github.com/scummvm/scummvm/commit/834955959802dce12286bbeed3e5f628a3236c86
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2015-09-08T08:48:50+01:00

Commit Message:
MORTEVIELLE: Fix loading of BRUITS file

This was broken in previous commit when adding support for versions
that do not have this file.

Changed paths:
    engines/mortevielle/sound.cpp



diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 70fb6f8..f02ccb6 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -145,8 +145,6 @@ void SoundManager::loadNoise() {
 		error("Missing file - bruit5");
 
 	if (f1.open("bruits")) { //Translation: "noise"
-		error("Missing file - bruits");
-
 		assert(f1.size() > 32000);
 		_noiseBuf = (byte *)malloc(sizeof(byte) * (f1.size() + f5.size()));