DIRECTOR: LINGO: Implement setting of timeOutLapsed property

scummvm · Jun 20, 2022 · 649ae31 · 649ae31
1 parent 271f2ae
commit 649ae31
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
@@ -121,6 +121,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 	_centerStage = true;
 
 	_surface = nullptr;
+	_tickBaseline = 0;
 }
 
 DirectorEngine::~DirectorEngine() {

diff --git a/engines/director/director.h b/engines/director/director.h
@@ -245,6 +245,9 @@ class DirectorEngine : public ::Engine {
 	Graphics::ManagedSurface *_surface;
 
 	StartOptions _options;
+
+public:
+	int _tickBaseline;
 };
 
 // An extension of MacPlotData for interfacing with inks and patterns without

diff --git a/engines/director/events.cpp b/engines/director/events.cpp
@@ -40,7 +40,7 @@
 
 namespace Director {
 
-uint32 DirectorEngine::getMacTicks() { return g_system->getMillis() * 60 / 1000.; }
+uint32 DirectorEngine::getMacTicks() { return (g_system->getMillis() * 60 / 1000.) - _tickBaseline; }
 
 bool DirectorEngine::processEvents(bool captureClick) {
 	debugC(3, kDebugEvents, "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");

diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
@@ -1105,7 +1105,9 @@ 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.
-		setTheEntitySTUB(kTheTimeoutLapsed);
+		if (g_director->getVersion() >= 400 && d.type == INT) {
+			g_director->_tickBaseline = g_director->getMacTicks() - d.asInt();
+		}
 		break;
 	case kTheTimeoutLength:
 		g_director->getCurrentMovie()->_timeOutLength = d.asInt();