[Scummvm-git-logs] scummvm master -> 2a1149a453877df142eb69c41308ffcd533803dd

[rvanlaar]

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:
c52befe02e JANITORIAL: Code style fixes
2a1149a453 DIRECTOR: LINGO: Implement property the exitLock


Commit: c52befe02e784aaba3f4e7ecca8e91a3de3913a6
    https://github.com/scummvm/scummvm/commit/c52befe02e784aaba3f4e7ecca8e91a3de3913a6
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-03-11T19:44:22+01:00

Commit Message:
JANITORIAL: Code style fixes

Changed paths:
    engines/director/castmember.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 199943e7977..c78201b90b7 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -361,7 +361,7 @@ bool DigitalVideoCastMember::loadVideo(Common::String path) {
 
 	debugC(2, kDebugLoading | kDebugImages, "Loading video %s", path.c_str());
 	bool result = _video->loadFile(Common::Path(path, g_director->_dirSeparator));
-	if (!result){
+	if (!result) {
 		_video = new Video::AVIDecoder();
 		result = _video->loadFile(Common::Path(path, g_director->_dirSeparator));
 	}


Commit: 2a1149a453877df142eb69c41308ffcd533803dd
    https://github.com/scummvm/scummvm/commit/2a1149a453877df142eb69c41308ffcd533803dd
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-03-11T20:32:54+01:00

Commit Message:
DIRECTOR: LINGO: Implement property the exitLock

In Director the exitLock prevents quitting the program when it's set to
TRUE. get and set for the exitLock is implemented.

The underlying functionality, preventing exiting a program, is not
implemented. ScummVM should always respond to a QUIT event.

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


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 839d6d53316..965ea990830 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -441,7 +441,8 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.u.i = (movie->_lastClickTime - movie->_lastClickTime2) <= 25 ? 1 : 0;
 		break;
 	case kTheExitLock:
-		getTheEntitySTUB(kTheExitLock);
+		d.type = INT;
+		d.u.i = g_lingo->_exitLock;
 		break;
 	case kTheField:
 		d = getTheField(id, field);
@@ -953,7 +954,7 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
 		warning("STUB: Lingo::setTheEntity(): Set color depth to %d", _vm->_colorDepth);
 		break;
 	case kTheExitLock:
-		setTheEntitySTUB(kTheExitLock);
+		g_lingo->_exitLock = bool(d.asInt());
 		break;
 	case kTheFixStageSize:
 		setTheEntitySTUB(kTheFixStageSize);
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index d69e434fa9f..ebab001e631 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -166,6 +166,8 @@ Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
 
 	_searchPath.type = ARRAY;
 	_searchPath.u.farr = new FArray;
+
+	_exitLock = false;
 	
 	// events
 	_passEvent = false;
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 07f5b38d6af..192e3f4ef68 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -380,6 +380,7 @@ public:
 	// global kTheEntity
 	Common::u32char_type_t _itemDelimiter;
 	Datum _searchPath;
+	bool _exitLock;
 
 	Datum getTheEntity(int entity, Datum &id, int field);
 	void setTheEntity(int entity, Datum &id, int field, Datum &d);