[Scummvm-git-logs] scummvm master -> 4e15bc1f080906134ef367c28a5ad2d22513900b

[sev-]

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:
4e15bc1f08 DIRECTOR: LINGO: Implemented few minor 'the' getters/setters


Commit: 4e15bc1f080906134ef367c28a5ad2d22513900b
    https://github.com/scummvm/scummvm/commit/4e15bc1f080906134ef367c28a5ad2d22513900b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-12T09:18:49+02:00

Commit Message:
DIRECTOR: LINGO: Implemented few minor 'the' getters/setters

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 274f79899b..392a3c789d 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -441,10 +441,12 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.u.i = 32 * 1024 * 1024;	// Let's have 32 Mbytes
 		break;
 	case kTheFullColorPermit:
-		getTheEntitySTUB(kTheFullColorPermit);
+		d.type = INT;
+		d.u.i = 1;					// We always allow it in ScummVM
 		break;
 	case kTheImageDirect:
-		getTheEntitySTUB(kTheImageDirect);
+		d.type = INT;
+		d.u.i = 1;					// We always allow it in ScummVM
 		break;
 	case kTheItemDelimiter:
 		getTheEntitySTUB(kTheItemDelimiter);
@@ -747,7 +749,8 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		getTheEntitySTUB(kTheSwitchColorDepth);
 		break;
 	case kTheTicks:
-		getTheEntitySTUB(kTheTicks);
+		d.type = INT;
+		d.u.i = _vm->getMacTicks();
 		break;
 	case kTheTime:
 		d = getTheTime(field);
@@ -869,10 +872,10 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
 		setTheEntitySTUB(kTheFramePalette);
 		break;
 	case kTheFullColorPermit:
-		setTheEntitySTUB(kTheFullColorPermit);
+		// No op in ScummVM. We always allow it
 		break;
 	case kTheImageDirect:
-		setTheEntitySTUB(kTheImageDirect);
+		// No op in ScummVM. We always allow it
 		break;
 	case kTheItemDelimiter:
 		setTheEntitySTUB(kTheItemDelimiter);