aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2014-01-28 23:22:41 -0500
committerPaul Gilbert2014-01-28 23:22:41 -0500
commit336a02047b1b52f7a052712bcce2b3608958f8b6 (patch)
tree88da283dd5bdf2970f15fa5e710d6cb7258d2cd1 /engines
parentd2e8a6bed53c58ac3c9100dee399585c781fe9fb (diff)
downloadscummvm-rg350-336a02047b1b52f7a052712bcce2b3608958f8b6.tar.gz
scummvm-rg350-336a02047b1b52f7a052712bcce2b3608958f8b6.tar.bz2
scummvm-rg350-336a02047b1b52f7a052712bcce2b3608958f8b6.zip
VOYEUR: Fixes for flagging video events, and reviewing them in reviewTape
Diffstat (limited to 'engines')
-rw-r--r--engines/voyeur/files_threads.cpp2
-rw-r--r--engines/voyeur/voyeur.cpp1
-rw-r--r--engines/voyeur/voyeur_game.cpp8
3 files changed, 6 insertions, 5 deletions
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 6ce772922b..a7e69c90c2 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -436,7 +436,7 @@ void ThreadResource::parsePlayCommands() {
_vm->_videoId = -1;
} else {
_vm->_voy._vocSecondsOffset = _vm->_voy._RTVNum - _vm->_voy._field468;
- _vm->_voy.addAudioEventStart();
+ _vm->_voy.addVideoEventStart();
_vm->_voy._field478 &= ~1;
_vm->_voy._field478 |= 0x10;
_vm->playAVideo(_vm->_videoId);
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 490d35e345..12d627ddb4 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -561,6 +561,7 @@ void VoyeurEngine::playAVideoDuration(int videoId, int duration) {
decoder.seek(Audio::Timestamp(_voy._vocSecondsOffset * 1000, decoder.getHeader().getFrameRate()));
int endFrame = decoder.getCurFrame() + totalFrames;
+ _eventsManager.getMouseInfo();
while (!shouldQuit() && !decoder.endOfVideo() && !_eventsManager._mouseClicked &&
(decoder.getCurFrame() < endFrame)) {
if (decoder.needsUpdate()) {
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 95c6deb1e7..ed04c875b9 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -535,10 +535,10 @@ void VoyeurEngine::reviewTape() {
foundIndex = 999;
} else if (!_eventsManager._leftClick) {
_eventsManager.setCursorColor(128, 2);
- foundIndex = 999;
+ foundIndex = -1;
} else {
_eventsManager.setCursorColor(128, 2);
- eventLine = foundIndex;
+ eventLine = foundIndex;
flipPageAndWait();
@@ -562,7 +562,7 @@ void VoyeurEngine::reviewTape() {
Common::String msg = _eventsManager.getEvidString(evtIndex);
_graphicsManager._backgroundPage->drawText(msg);
- yp += 115;
+ yp += 15;
++evtIndex;
}
@@ -575,7 +575,7 @@ void VoyeurEngine::reviewTape() {
flipPageAndWait();
_eventsManager.getMouseInfo();
- foundIndex = 999;
+ foundIndex = -1;
}
} else if ((_voy._field478 & 0x40) && _voy._viewBounds->left == pt.x &&
_voy._viewBounds->bottom == pt.y) {