[Scummvm-git-logs] scummvm master -> 79d381ad6e2f5644494f352f742e473e2663340a

[sev-]

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

Summary:
ef03c0ba34 DIRECTOR: Do not freak out when first movie in tests is not readable
79d381ad6e DIRECTOR: LINGO: Fix regression in parsing code


Commit: ef03c0ba346de13535a86eeedc15e7865f458873
    https://github.com/scummvm/scummvm/commit/ef03c0ba346de13535a86eeedc15e7865f458873
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-21T23:42:10+01:00

Commit Message:
DIRECTOR: Do not freak out when first movie in tests is not readable

Changed paths:
    engines/director/director.cpp
    engines/director/resource.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index e82088e..02f8e51 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -184,7 +184,8 @@ Common::Error DirectorEngine::run() {
 		loadInitialMovie(getEXEName());
 	}
 
-	_currentScore->setArchive(_mainArchive);
+	if (_currentScore)
+		_currentScore->setArchive(_mainArchive);
 
 	bool loop = true;
 
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index d0f802a..ad3537a 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -250,8 +250,11 @@ void DirectorEngine::loadMac(const Common::String movie) {
 			startOffset = 0;
 		}
 
-		if (!_mainArchive->openStream(dataFork, startOffset))
-			error("Failed to load RIFX from Mac binary");
+		if (!_mainArchive->openStream(dataFork, startOffset)) {
+			warning("Failed to load RIFX from Mac binary");
+			delete _currentScore;
+			_currentScore = nullptr;
+		}
 	}
 }
 


Commit: 79d381ad6e2f5644494f352f742e473e2663340a
    https://github.com/scummvm/scummvm/commit/79d381ad6e2f5644494f352f742e473e2663340a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-21T23:44:45+01:00

Commit Message:
DIRECTOR: LINGO: Fix regression in parsing code

Changed paths:
    engines/director/lingo/lingo-lex.cpp
    engines/director/lingo/lingo-lex.l


diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index a215ec8..cf078e8 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -1576,7 +1576,7 @@ YY_RULE_SETUP
 				}
 
 				yylval.objectfield.os = new Common::String(ptr);
-				yylval.objectfield.oe = g_lingo->_theEntityFields[field]->field;
+				yylval.objectfield.oe = g_lingo->_theEntityFields[key]->field;
 
 				return THEOBJECTFIELD;
 			}
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 2055b07..a717950 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -305,7 +305,7 @@ the[ \t]+[[:alpha:]]+[ \t]+of[ \t]+{identifier}	{
 				}
 
 				yylval.objectfield.os = new Common::String(ptr);
-				yylval.objectfield.oe = g_lingo->_theEntityFields[field]->field;
+				yylval.objectfield.oe = g_lingo->_theEntityFields[key]->field;
 
 				return THEOBJECTFIELD;
 			}