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

sev- noreply at scummvm.org
Tue Jun 21 23:25:18 UTC 2022


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:
b47610210b DIRECTOR: LINGO: Accept FLOAT for 'the timeoutLapsed'


Commit: b47610210bfe0879d9924912f833cc7ea1bc30e4
    https://github.com/scummvm/scummvm/commit/b47610210bfe0879d9924912f833cc7ea1bc30e4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-22T01:24:47+02:00

Commit Message:
DIRECTOR: LINGO: Accept FLOAT for 'the timeoutLapsed'

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 5b96d9056e5..46b2fcaa89c 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1205,7 +1205,7 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
 		break;
 	case kTheTimeoutLapsed:
 		// timeOutLapsed can be set in D4, but can't in D3. see D3.1 interactivity manual p312 and D4 dictionary p296.
-		if (g_director->getVersion() >= 400 && d.type == INT) {
+		if (g_director->getVersion() >= 400 && (d.type == INT || d.type == FLOAT)) {
 			g_director->_tickBaseline = g_director->getMacTicks() - d.asInt();
 		}
 		if (d.type != INT) {




More information about the Scummvm-git-logs mailing list