aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/voyeur/events.cpp4
-rw-r--r--engines/voyeur/voyeur_game.cpp7
2 files changed, 7 insertions, 4 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 74d8eeee44..6ac36ddb94 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -409,7 +409,7 @@ void EventsManager::vDoCycleInt() {
// Move palette entry to end of range
int start = READ_LE_UINT16(pSrc);
int end = READ_LE_UINT16(&pSrc[2]);
- assert(start < 0x100 && end <= 0x100);
+ assert(start < 0x100 && end < 0x100);
// Store the RGB of the first entry to be moved
byte r = pPal[start * 3];
@@ -433,7 +433,7 @@ void EventsManager::vDoCycleInt() {
// Move palette entry to start of range
int start = READ_LE_UINT16(pSrc);
int end = READ_LE_UINT16(&pSrc[2]);
- assert(start < 0x100 && end <= 0x100);
+ assert(start < 0x100 && end < 0x100);
// Store the RGB of the entry to be moved
byte r = pPal[end * 3];
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 963caabc12..740bf1728a 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -131,10 +131,13 @@ void VoyeurEngine::playStamp() {
if (!checkForMurder() && _voy._transitionId <= 15)
checkForIncriminate();
- if (_voy._videoEventId != -1)
+ if (_voy._videoEventId != -1) {
playAVideoEvent(_voy._videoEventId);
- _voy._field478 &= 0x10;
+ _voy._field478 &= ~0x10;
+ }
+
threadP->chooseSTAMPButton(0);
+ flag = true;
break;
case 130: {