[Scummvm-git-logs] scummvm master -> 3dc6539d254740bdf8d7cb40ab64cb2f6e7a8f8d

[djsrv]

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:
eb146b8bd6 DIRECTOR: LINGO: Initialize global vars as 0
3dc6539d25 DIRECTOR: LINGO: Implement kTheMovie*/kThePathName


Commit: eb146b8bd638be9bf0510e45352f77d5011b0ca2
    https://github.com/scummvm/scummvm/commit/eb146b8bd638be9bf0510e45352f77d5011b0ca2
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-12T15:36:43-04:00

Commit Message:
DIRECTOR: LINGO: Initialize global vars as 0

Changed paths:
    engines/director/lingo/lingo-codegen.cpp


diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 01a987778f..ec9e9b9cef 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -286,6 +286,8 @@ void Lingo::varCreate(const Common::String &name, bool global, SymbolHash *local
 	if (global) {
 		_globalvars[name] = Symbol();
 		_globalvars[name].name = new Common::String(name);
+		_globalvars[name].type = INT;
+		_globalvars[name].u.i = 0;
 	} else {
 		(*localvars)[name] = Symbol();
 		(*localvars)[name].name = new Common::String(name);


Commit: 3dc6539d254740bdf8d7cb40ab64cb2f6e7a8f8d
    https://github.com/scummvm/scummvm/commit/3dc6539d254740bdf8d7cb40ab64cb2f6e7a8f8d
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-12T15:36:44-04:00

Commit Message:
DIRECTOR: LINGO: Implement kTheMovie*/kThePathName

Changed paths:
    engines/director/lingo/lingo-the.cpp


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index ebf36d4daf..f0fab20715 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -454,8 +454,14 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.u.i = _vm->_machineType;
 		break;
 	case kTheMovie:
+	case kTheMovieName:
 		d.type = STRING;
-		d.u.s = new Common::String(_vm->getCurrentScore()->getArchive()->getFileName());
+		d.u.s = new Common::String(_vm->getCurrentScore()->getMacName());
+		break;
+	case kTheMoviePath:
+	case kThePathName:
+		d.type = STRING;
+		d.u.s = new Common::String(_vm->getCurrentPath());
 		break;
 	case kTheMouseCast:
 		{