[Scummvm-git-logs] scummvm master -> 1ce36183bd6cfc03907580304dcd9a57a0f7333d
sev-
sev at scummvm.org
Sun Apr 12 15:49:09 UTC 2020
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8532628f97 DIRECTOR: LINGO: Implement kTheLastFrame property
de24b461b9 DIRECTOR: Implement getMacTicks utility
c5651d67a6 DIRECTOR: LINGO: Implement kTheLastKey function
0e15e2f080 DIRECTOR: LINGO: Implement kTheLastClick function
070b4266ed DIRECTOR: LINGO: Implement kTheLastEvent function
9909097285 DIRECTOR: LINGO: Implement kTheLastRoll function
1ce36183bd DIRECTOR: JANITORIAL: Change spaces to tabs
Commit: 8532628f972c8afd0bb40a0fb6cbef4dca93eaae
https://github.com/scummvm/scummvm/commit/8532628f972c8afd0bb40a0fb6cbef4dca93eaae
Author: Nathanael Gentry (ngentry1 at liberty.edu)
Date: 2020-04-12T17:49:01+02:00
Commit Message:
DIRECTOR: LINGO: Implement kTheLastFrame property
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 a1332510d6..41d728d380 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -425,7 +425,11 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
case kTheStillDown:
d.type = INT;
d.u.i = _vm->getCurrentScore()->_mouseIsDown;
- break;
+ break;
+ case kTheLastFrame:
+ d.type = INT;
+ d.u.i = _vm->getCurrentScore()->_frames.size() - 1;
+ break;
default:
warning("Lingo::getTheEntity(): Unprocessed getting field \"%s\" of entity %s", field2str(field), entity2str(entity));
d.type = VOID;
Commit: de24b461b9b2be5a422b548ae0aa3e7df8ae6f4c
https://github.com/scummvm/scummvm/commit/de24b461b9b2be5a422b548ae0aa3e7df8ae6f4c
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-04-12T17:49:01+02:00
Commit Message:
DIRECTOR: Implement getMacTicks utility
Changed paths:
engines/director/director.h
engines/director/events.cpp
diff --git a/engines/director/director.h b/engines/director/director.h
index 8ed66938e1..cbbe271b86 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -128,6 +128,7 @@ public:
// events.cpp
void processEvents();
void setDraggedSprite(uint16 id);
+ uint32 getMacTicks();
void waitForClick();
public:
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 5bd6815173..0e2a37f6f4 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -50,6 +50,8 @@ bool processQuitEvent(bool click) {
return false;
}
+uint32 DirectorEngine::getMacTicks() { return g_system->getMillis() * 60 / 1000.; }
+
void DirectorEngine::processEvents() {
Common::Event event;
Commit: c5651d67a6123964d00105f83777bdcfcbbf390f
https://github.com/scummvm/scummvm/commit/c5651d67a6123964d00105f83777bdcfcbbf390f
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-04-12T17:49:01+02:00
Commit Message:
DIRECTOR: LINGO: Implement kTheLastKey function
Changed paths:
engines/director/events.cpp
engines/director/lingo/lingo-the.cpp
engines/director/score.cpp
engines/director/score.h
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 0e2a37f6f4..e62861fc57 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -129,6 +129,7 @@ void DirectorEngine::processEvents() {
debugC(1, kDebugEvents, "processEvents(): keycode: %d", _keyCode);
}
+ sc->_lastKeyTime = g_director->getMacTicks();
_lingo->processEvent(kEventKeyDown);
break;
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 41d728d380..d68d162799 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -429,6 +429,10 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
case kTheLastFrame:
d.type = INT;
d.u.i = _vm->getCurrentScore()->_frames.size() - 1;
+ break;
+ case kTheLastKey:
+ d.type = INT;
+ d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastKeyTime;
break;
default:
warning("Lingo::getTheEntity(): Unprocessed getting field \"%s\" of entity %s", field2str(field), entity2str(entity));
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 09ff870567..8d22a24976 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -76,6 +76,7 @@ Score::Score(DirectorEngine *vm) {
_soundManager = _vm->getSoundManager();
_currentMouseDownSpriteId = 0;
_mouseIsDown = false;
+ _lastKeyTime = _vm->getMacTicks();
// FIXME: TODO: Check whether the original truely does it
if (_vm->getVersion() <= 3) {
diff --git a/engines/director/score.h b/engines/director/score.h
index 86b643d0e2..76bcb028c9 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -142,6 +142,7 @@ public:
Common::Rect _movieRect;
uint16 _currentMouseDownSpriteId;
bool _mouseIsDown;
+ uint32 _lastKeyTime;
bool _stopPlay;
uint32 _nextFrameTime;
Commit: 0e15e2f080d1ae34635df076a684a3b56b7f4f13
https://github.com/scummvm/scummvm/commit/0e15e2f080d1ae34635df076a684a3b56b7f4f13
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-04-12T17:49:01+02:00
Commit Message:
DIRECTOR: LINGO: Implement kTheLastClick function
Changed paths:
engines/director/events.cpp
engines/director/lingo/lingo-the.cpp
engines/director/score.cpp
engines/director/score.h
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index e62861fc57..722129fb76 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -86,6 +86,7 @@ void DirectorEngine::processEvents() {
sc->_currentMouseDownSpriteId = spriteId;
sc->_mouseIsDown = true;
+ sc->_lastClickTime = g_director->getMacTicks();
debugC(3, kDebugEvents, "event: Button Down @(%d, %d), sprite id: %d", pos.x, pos.y, spriteId);
_lingo->processEvent(kEventMouseDown);
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index d68d162799..df9ce8e32b 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -430,6 +430,10 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = _vm->getCurrentScore()->_frames.size() - 1;
break;
+ case kTheLastClick:
+ d.type = INT;
+ d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastClickTime;
+ break;
case kTheLastKey:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastKeyTime;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 8d22a24976..00748de951 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -77,6 +77,7 @@ Score::Score(DirectorEngine *vm) {
_currentMouseDownSpriteId = 0;
_mouseIsDown = false;
_lastKeyTime = _vm->getMacTicks();
+ _lastClickTime = _vm->getMacTicks();
// FIXME: TODO: Check whether the original truely does it
if (_vm->getVersion() <= 3) {
diff --git a/engines/director/score.h b/engines/director/score.h
index 76bcb028c9..a013b6cd48 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -142,6 +142,7 @@ public:
Common::Rect _movieRect;
uint16 _currentMouseDownSpriteId;
bool _mouseIsDown;
+ uint32 _lastClickTime;
uint32 _lastKeyTime;
bool _stopPlay;
Commit: 070b4266ed2dd14db6fe529dea923bcee6b88f8e
https://github.com/scummvm/scummvm/commit/070b4266ed2dd14db6fe529dea923bcee6b88f8e
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-04-12T17:49:01+02:00
Commit Message:
DIRECTOR: LINGO: Implement kTheLastEvent function
Changed paths:
engines/director/events.cpp
engines/director/lingo/lingo-the.cpp
engines/director/score.cpp
engines/director/score.h
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 722129fb76..4e925376e0 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -77,6 +77,10 @@ void DirectorEngine::processEvents() {
sc->_stopPlay = true;
break;
+ case Common::EVENT_MOUSEMOVE:
+ sc->_lastEventTime = g_director->getMacTicks();
+ break;
+
case Common::EVENT_LBUTTONDOWN:
pos = g_system->getEventManager()->getMousePos();
@@ -86,7 +90,8 @@ void DirectorEngine::processEvents() {
sc->_currentMouseDownSpriteId = spriteId;
sc->_mouseIsDown = true;
- sc->_lastClickTime = g_director->getMacTicks();
+ sc->_lastEventTime = g_director->getMacTicks();
+ sc->_lastClickTime = sc->_lastEventTime;
debugC(3, kDebugEvents, "event: Button Down @(%d, %d), sprite id: %d", pos.x, pos.y, spriteId);
_lingo->processEvent(kEventMouseDown);
@@ -130,7 +135,8 @@ void DirectorEngine::processEvents() {
debugC(1, kDebugEvents, "processEvents(): keycode: %d", _keyCode);
}
- sc->_lastKeyTime = g_director->getMacTicks();
+ sc->_lastEventTime = g_director->getMacTicks();
+ sc->_lastKeyTime = sc->_lastEventTime;
_lingo->processEvent(kEventKeyDown);
break;
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index df9ce8e32b..9883a50bfa 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -430,6 +430,10 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = _vm->getCurrentScore()->_frames.size() - 1;
break;
+ case kTheLastEvent:
+ d.type = INT;
+ d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastEventTime;
+ break;
case kTheLastClick:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastClickTime;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 00748de951..cd94d26481 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -76,8 +76,9 @@ Score::Score(DirectorEngine *vm) {
_soundManager = _vm->getSoundManager();
_currentMouseDownSpriteId = 0;
_mouseIsDown = false;
- _lastKeyTime = _vm->getMacTicks();
- _lastClickTime = _vm->getMacTicks();
+ _lastEventTime = _vm->getMacTicks();
+ _lastKeyTime = _lastEventTime;
+ _lastClickTime = _lastEventTime;
// FIXME: TODO: Check whether the original truely does it
if (_vm->getVersion() <= 3) {
diff --git a/engines/director/score.h b/engines/director/score.h
index a013b6cd48..2eefef7b2f 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -142,6 +142,7 @@ public:
Common::Rect _movieRect;
uint16 _currentMouseDownSpriteId;
bool _mouseIsDown;
+ uint32 _lastEventTime;
uint32 _lastClickTime;
uint32 _lastKeyTime;
Commit: 9909097285c086039bc42cda35134f73c4fad2ab
https://github.com/scummvm/scummvm/commit/9909097285c086039bc42cda35134f73c4fad2ab
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-04-12T17:49:01+02:00
Commit Message:
DIRECTOR: LINGO: Implement kTheLastRoll function
Changed paths:
engines/director/events.cpp
engines/director/lingo/lingo-the.cpp
engines/director/score.cpp
engines/director/score.h
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 4e925376e0..4fb4ac0648 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -79,6 +79,7 @@ void DirectorEngine::processEvents() {
case Common::EVENT_MOUSEMOVE:
sc->_lastEventTime = g_director->getMacTicks();
+ sc->_lastRollTime = sc->_lastEventTime;
break;
case Common::EVENT_LBUTTONDOWN:
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 9883a50bfa..321febbb60 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -441,6 +441,10 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
case kTheLastKey:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastKeyTime;
+ break;
+ case kTheLastRoll:
+ d.type = INT;
+ d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastRollTime;
break;
default:
warning("Lingo::getTheEntity(): Unprocessed getting field \"%s\" of entity %s", field2str(field), entity2str(entity));
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index cd94d26481..0ef3b19925 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -79,6 +79,7 @@ Score::Score(DirectorEngine *vm) {
_lastEventTime = _vm->getMacTicks();
_lastKeyTime = _lastEventTime;
_lastClickTime = _lastEventTime;
+ _lastRollTime = _lastEventTime;
// FIXME: TODO: Check whether the original truely does it
if (_vm->getVersion() <= 3) {
diff --git a/engines/director/score.h b/engines/director/score.h
index 2eefef7b2f..0f419922eb 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -143,6 +143,7 @@ public:
uint16 _currentMouseDownSpriteId;
bool _mouseIsDown;
uint32 _lastEventTime;
+ uint32 _lastRollTime;
uint32 _lastClickTime;
uint32 _lastKeyTime;
Commit: 1ce36183bd6cfc03907580304dcd9a57a0f7333d
https://github.com/scummvm/scummvm/commit/1ce36183bd6cfc03907580304dcd9a57a0f7333d
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-04-12T17:49:01+02:00
Commit Message:
DIRECTOR: JANITORIAL: Change spaces to tabs
Changed paths:
engines/director/director.h
engines/director/events.cpp
engines/director/lingo/lingo-the.cpp
engines/director/score.cpp
engines/director/score.h
diff --git a/engines/director/director.h b/engines/director/director.h
index cbbe271b86..1047801984 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -128,7 +128,7 @@ public:
// events.cpp
void processEvents();
void setDraggedSprite(uint16 id);
- uint32 getMacTicks();
+ uint32 getMacTicks();
void waitForClick();
public:
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 4fb4ac0648..b9de63a623 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -77,10 +77,10 @@ void DirectorEngine::processEvents() {
sc->_stopPlay = true;
break;
- case Common::EVENT_MOUSEMOVE:
- sc->_lastEventTime = g_director->getMacTicks();
- sc->_lastRollTime = sc->_lastEventTime;
- break;
+ case Common::EVENT_MOUSEMOVE:
+ sc->_lastEventTime = g_director->getMacTicks();
+ sc->_lastRollTime = sc->_lastEventTime;
+ break;
case Common::EVENT_LBUTTONDOWN:
pos = g_system->getEventManager()->getMousePos();
@@ -91,8 +91,8 @@ void DirectorEngine::processEvents() {
sc->_currentMouseDownSpriteId = spriteId;
sc->_mouseIsDown = true;
- sc->_lastEventTime = g_director->getMacTicks();
- sc->_lastClickTime = sc->_lastEventTime;
+ sc->_lastEventTime = g_director->getMacTicks();
+ sc->_lastClickTime = sc->_lastEventTime;
debugC(3, kDebugEvents, "event: Button Down @(%d, %d), sprite id: %d", pos.x, pos.y, spriteId);
_lingo->processEvent(kEventMouseDown);
@@ -136,8 +136,8 @@ void DirectorEngine::processEvents() {
debugC(1, kDebugEvents, "processEvents(): keycode: %d", _keyCode);
}
- sc->_lastEventTime = g_director->getMacTicks();
- sc->_lastKeyTime = sc->_lastEventTime;
+ sc->_lastEventTime = g_director->getMacTicks();
+ sc->_lastKeyTime = sc->_lastEventTime;
_lingo->processEvent(kEventKeyDown);
break;
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 321febbb60..6af48ba6e3 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -426,26 +426,26 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = _vm->getCurrentScore()->_mouseIsDown;
break;
- case kTheLastFrame:
- d.type = INT;
- d.u.i = _vm->getCurrentScore()->_frames.size() - 1;
+ case kTheLastFrame:
+ d.type = INT;
+ d.u.i = _vm->getCurrentScore()->_frames.size() - 1;
+ break;
+ case kTheLastEvent:
+ d.type = INT;
+ d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastEventTime;
+ break;
+ case kTheLastClick:
+ d.type = INT;
+ d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastClickTime;
+ break;
+ case kTheLastKey:
+ d.type = INT;
+ d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastKeyTime;
+ break;
+ case kTheLastRoll:
+ d.type = INT;
+ d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastRollTime;
break;
- case kTheLastEvent:
- d.type = INT;
- d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastEventTime;
- break;
- case kTheLastClick:
- d.type = INT;
- d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastClickTime;
- break;
- case kTheLastKey:
- d.type = INT;
- d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastKeyTime;
- break;
- case kTheLastRoll:
- d.type = INT;
- d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastRollTime;
- break;
default:
warning("Lingo::getTheEntity(): Unprocessed getting field \"%s\" of entity %s", field2str(field), entity2str(entity));
d.type = VOID;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 0ef3b19925..70b0114a86 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -76,10 +76,10 @@ Score::Score(DirectorEngine *vm) {
_soundManager = _vm->getSoundManager();
_currentMouseDownSpriteId = 0;
_mouseIsDown = false;
- _lastEventTime = _vm->getMacTicks();
- _lastKeyTime = _lastEventTime;
- _lastClickTime = _lastEventTime;
- _lastRollTime = _lastEventTime;
+ _lastEventTime = _vm->getMacTicks();
+ _lastKeyTime = _lastEventTime;
+ _lastClickTime = _lastEventTime;
+ _lastRollTime = _lastEventTime;
// FIXME: TODO: Check whether the original truely does it
if (_vm->getVersion() <= 3) {
diff --git a/engines/director/score.h b/engines/director/score.h
index 0f419922eb..b06158d8d4 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -142,10 +142,10 @@ public:
Common::Rect _movieRect;
uint16 _currentMouseDownSpriteId;
bool _mouseIsDown;
- uint32 _lastEventTime;
- uint32 _lastRollTime;
- uint32 _lastClickTime;
- uint32 _lastKeyTime;
+ uint32 _lastEventTime;
+ uint32 _lastRollTime;
+ uint32 _lastClickTime;
+ uint32 _lastKeyTime;
bool _stopPlay;
uint32 _nextFrameTime;
More information about the Scummvm-git-logs
mailing list