libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 23:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: Fix guilt check post doTapePlaying call

Browse Source
This commit is contained in:
Paul Gilbert 2013-12-31 18:39:38 +11:00
parent 87a6e72fc5
commit 2d71a0594d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/voyeur/events.cpp
View File

@ -409,7 +409,7 @@ void EventsManager::vDoCycleInt() {
// Move palette entry to end of range // Move palette entry to end of range
int start = READ_LE_UINT16(pSrc); int start = READ_LE_UINT16(pSrc);
int end = READ_LE_UINT16(&pSrc[2]); 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 // Store the RGB of the first entry to be moved
byte r = pPal[start * 3]; byte r = pPal[start * 3];
@ -433,7 +433,7 @@ void EventsManager::vDoCycleInt() {
// Move palette entry to start of range // Move palette entry to start of range
int start = READ_LE_UINT16(pSrc); int start = READ_LE_UINT16(pSrc);
int end = READ_LE_UINT16(&pSrc[2]); 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 // Store the RGB of the entry to be moved
byte r = pPal[end * 3]; byte r = pPal[end * 3];

7
engines/voyeur/voyeur_game.cpp
View File

@ -131,10 +131,13 @@ void VoyeurEngine::playStamp() {
if (!checkForMurder() && _voy._transitionId <= 15) if (!checkForMurder() && _voy._transitionId <= 15)
checkForIncriminate(); checkForIncriminate();
if (_voy._videoEventId != -1) if (_voy._videoEventId != -1) {
playAVideoEvent(_voy._videoEventId); playAVideoEvent(_voy._videoEventId);
_voy._field478 &= 0x10; _voy._field478 &= ~0x10;
}
threadP->chooseSTAMPButton(0); threadP->chooseSTAMPButton(0);
flag = true;
break; break;
case 130: { case 130: {