[Scummvm-git-logs] scummvm master -> b35c5cba3938e8aef21fb64c52a41654882d1398

[dreammaster]

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:
b35c5cba39 ACCESS: AMAZON: Fix crash due to Common::Language change


Commit: b35c5cba3938e8aef21fb64c52a41654882d1398
    https://github.com/scummvm/scummvm/commit/b35c5cba3938e8aef21fb64c52a41654882d1398
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-03-03T21:52:57-08:00

Commit Message:
ACCESS: AMAZON: Fix crash due to Common::Language change

Thanks to eriktorbjorn for noticing a new addition to the
Common::Language enum was breaking the game

Changed paths:
    engines/access/resources.cpp


diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index a7b23eb..2b7f1aa 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -70,7 +70,20 @@ bool Resources::load(Common::String &errorMessage) {
 		_datIndex[idx]._gameId = f.readByte();
 		_datIndex[idx]._discType = f.readByte();
 		_datIndex[idx]._demoType = f.readByte();
-		_datIndex[idx]._language = (Common::Language)f.readByte();
+
+		byte language = f.readByte();
+		switch (language) {
+		case 0:
+			_datIndex[idx]._language = (Common::Language)0;
+			break;
+		case 5:
+			_datIndex[idx]._language = Common::EN_ANY;
+			break;
+		default:
+			error("Unknown language");
+			break;
+		}
+
 		_datIndex[idx]._fileOffset = f.readUint32LE();
 	}