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

VOYEUR: Rename the old _playStamp1/2 variables to have better names

Browse Source
This commit is contained in:
Paul Gilbert 2014-01-05 14:54:55 -05:00
parent 1690ffb2bf
commit 9c2b761b31
5 changed files with 123 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/voyeur/events.cpp
View File

@ -644,7 +644,7 @@ void EventsManager::addComputerEventStart() {
e._minute = _vm->_gameMinute;
e._isAM = _vm->_voy._isAM;
e._type = EVTYPE_COMPUTER;
e._videoId = _vm->_playStamp1;
e._videoId = _vm->_playStampGroupId;
e._computerOn = _vm->_voy._computerTextId;
}

152
engines/voyeur/files_threads.cpp
View File

@ -359,7 +359,7 @@ void ThreadResource::parsePlayCommands() {
switch (id) {
case 1:
_vm->_playStamp2 = READ_LE_UINT16(dataP);
_vm->_currentVocId = READ_LE_UINT16(dataP);
dataP += 2;
break;
@ -441,7 +441,7 @@ void ThreadResource::parsePlayCommands() {
_vm->_eventsManager.incrementTime(1);
_vm->_videoId = -1;
_vm->_playStamp1 = -1;
_vm->_playStampGroupId = -1;
if (_vm->_eventsManager._videoDead != -1) {
_vm->_bVoy->freeBoltGroup(0xE00);
@ -470,7 +470,7 @@ void ThreadResource::parsePlayCommands() {
if (id == 22) {
int resolveIndex = READ_LE_UINT16(dataP);
dataP += 2;
_vm->_playStamp1 = _vm->_resolvePtr[resolveIndex];
_vm->_playStampGroupId = _vm->_resolvePtr[resolveIndex];
}
_vm->_voy._vocSecondsOffset = 0;
@ -484,13 +484,13 @@ void ThreadResource::parsePlayCommands() {
parseIndex = 999;
} else {
// TODO: Double-check this
int count = _vm->_bVoy->getBoltGroup(_vm->_playStamp1)->_entries.size();
int count = _vm->_bVoy->getBoltGroup(_vm->_playStampGroupId)->_entries.size();
_vm->_soundManager.stopVOCPlay();
_vm->_eventsManager.getMouseInfo();
for (int i = 0; i < count; ++i) {
pic = _vm->_bVoy->boltEntry(_vm->_playStamp1 + i * 2)._picResource;
pal = _vm->_bVoy->boltEntry(_vm->_playStamp1 + i * 2 + 1)._cMapResource;
pic = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + i * 2)._picResource;
pal = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + i * 2 + 1)._cMapResource;
(*_vm->_graphicsManager._vPort)->setupViewPort(pic);
pal->startFade();
@ -498,8 +498,8 @@ void ThreadResource::parsePlayCommands() {
_vm->flipPageAndWaitForFade();
if (i > 0) {
_vm->_bVoy->freeBoltMember(_vm->_playStamp1 + i * 2);
_vm->_bVoy->freeBoltMember(_vm->_playStamp1 + i * 2 + 1);
_vm->_bVoy->freeBoltMember(_vm->_playStampGroupId + i * 2);
_vm->_bVoy->freeBoltMember(_vm->_playStampGroupId + i * 2 + 1);
}
Common::String file = Common::String::format("news%d.voc", i + 1);
@ -520,8 +520,8 @@ void ThreadResource::parsePlayCommands() {
break;
}
_vm->_bVoy->freeBoltGroup(_vm->_playStamp1);
_vm->_playStamp1 = -1;
_vm->_bVoy->freeBoltGroup(_vm->_playStampGroupId);
_vm->_playStampGroupId = -1;
_vm->_videoId = -1;
parseIndex = 999;
}
@ -555,7 +555,7 @@ void ThreadResource::parsePlayCommands() {
case 6:
_vm->_voy._field470 = 6;
v2 = READ_LE_UINT16(dataP);
_vm->_playStamp1 = _vm->_resolvePtr[v2];
_vm->_playStampGroupId = _vm->_resolvePtr[v2];
dataP += 2;
break;
@ -660,17 +660,17 @@ void ThreadResource::parsePlayCommands() {
break;
case 14:
_vm->_playStamp1 = 2048;
_vm->_playStampGroupId = 2048;
_vm->_voy._field470 = 130;
break;
case 15:
_vm->_playStamp1 = (_vm->_voy._field4382 - 1) * 8 + 0x7700;
_vm->_playStampGroupId = (_vm->_voy._field4382 - 1) * 8 + 0x7700;
_vm->_voy._field47A = ((READ_LE_UINT16(_vm->_controlPtr->_ptr + 4)
- 1) << 8) + 0x7B00;
pic = _vm->_bVoy->boltEntry(_vm->_playStamp1)._picResource;
_cmd14Pal = _vm->_bVoy->boltEntry(_vm->_playStamp1 + 1)._cMapResource;
pic = _vm->_bVoy->boltEntry(_vm->_playStampGroupId)._picResource;
_cmd14Pal = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + 1)._cMapResource;
(*_vm->_graphicsManager._vPort)->setupViewPort(pic);
_cmd14Pal->startFade();
@ -683,16 +683,16 @@ void ThreadResource::parsePlayCommands() {
pic = _vm->_bVoy->boltEntry(_vm->_voy._field47A)._picResource;
_cmd14Pal = _vm->_bVoy->boltEntry(_vm->_voy._field47A + 1)._cMapResource;
} else {
pic = _vm->_bVoy->boltEntry(_vm->_playStamp1 + idx * 2)._picResource;
_cmd14Pal = _vm->_bVoy->boltEntry(_vm->_playStamp1 + idx * 2 + 1)._cMapResource;
pic = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + idx * 2)._picResource;
_cmd14Pal = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + idx * 2 + 1)._cMapResource;
}
(*_vm->_graphicsManager._vPort)->setupViewPort(pic);
_cmd14Pal->startFade();
_vm->flipPageAndWaitForFade();
_vm->_bVoy->freeBoltMember(_vm->_playStamp1 + (idx - 1) * 2);
_vm->_bVoy->freeBoltMember(_vm->_playStamp1 + (idx - 1) * 2 + 1);
_vm->_bVoy->freeBoltMember(_vm->_playStampGroupId + (idx - 1) * 2);
_vm->_bVoy->freeBoltMember(_vm->_playStampGroupId + (idx - 1) * 2 + 1);
Common::String fname = Common::String::format("news%d.voc", idx);
@ -708,9 +708,9 @@ void ThreadResource::parsePlayCommands() {
break;
}
_vm->_bVoy->freeBoltGroup(_vm->_playStamp1);
_vm->_bVoy->freeBoltGroup(_vm->_playStampGroupId);
_vm->_bVoy->freeBoltGroup(_vm->_voy._field47A);
_vm->_playStamp1 = -1;
_vm->_playStampGroupId = -1;
_vm->_voy._field47A = -1;
break;
@ -1024,16 +1024,16 @@ int ThreadResource::doApt() {
loadTheApt();
Common::Point aptPos(-1, -1);
_vm->_playStamp2 = 151;
_vm->_voy._viewBounds = _vm->_bVoy->boltEntry(_vm->_playStamp1)._rectResource;
_vm->_currentVocId = 151;
_vm->_voy._viewBounds = _vm->_bVoy->boltEntry(_vm->_playStampGroupId)._rectResource;
Common::Array<Common::Rect> &hotspots = _vm->_bVoy->boltEntry(
_vm->_playStamp1 + 1)._rectResource->_entries;
_vm->_playStampGroupId + 1)._rectResource->_entries;
_vm->_eventsManager.getMouseInfo();
if (aptPos.x == -1) {
aptPos.x = hotspots[2].left;
aptPos.y = hotspots[2].top;
_vm->_playStamp2 = 153;
_vm->_currentVocId = 153;
}
if (_vm->_voy._field470 == 16) {
@ -1044,8 +1044,8 @@ int ThreadResource::doApt() {
}
_vm->_eventsManager.setMousePos(Common::Point(aptPos.x, aptPos.y));
_vm->_soundManager.startVOCPlay(_vm->_soundManager.getVOCFileName(_vm->_playStamp2));
_vm->_playStamp2 = 151;
_vm->_soundManager.startVOCPlay(_vm->_soundManager.getVOCFileName(_vm->_currentVocId));
_vm->_currentVocId = 151;
_vm->_graphicsManager.setColor(129, 82, 82, 82);
_vm->_graphicsManager.setColor(130, 112, 112, 112);
@ -1064,8 +1064,8 @@ int ThreadResource::doApt() {
_vm->_eventsManager.getMouseInfo();
if (!_vm->_soundManager.getVOCStatus()) {
// Previous sound ended, so start up a new one
_vm->_playStamp2 = _vm->getRandomNumber(4) + 151;
_vm->_soundManager.startVOCPlay(_vm->_soundManager.getVOCFileName(_vm->_playStamp2));
_vm->_currentVocId = _vm->getRandomNumber(4) + 151;
_vm->_soundManager.startVOCPlay(_vm->_soundManager.getVOCFileName(_vm->_currentVocId));
}
// Loop through the hotspot list
@ -1082,7 +1082,7 @@ int ThreadResource::doApt() {
hotspotId = 5;
// Draw the text description for the highlighted hotspot
pic = _vm->_bVoy->boltEntry(_vm->_playStamp1 +
pic = _vm->_bVoy->boltEntry(_vm->_playStampGroupId +
hotspotId + 6)._picResource;
_vm->_graphicsManager.sDrawPic(pic, *_vm->_graphicsManager._vPort,
Common::Point(106, 200));
@ -1093,8 +1093,8 @@ int ThreadResource::doApt() {
}
// Draw either standard or highlighted eye cursor
pic = _vm->_bVoy->boltEntry((hotspotId == -1) ? _vm->_playStamp1 + 2 :
_vm->_playStamp1 + 3)._picResource;
pic = _vm->_bVoy->boltEntry((hotspotId == -1) ? _vm->_playStampGroupId + 2 :
_vm->_playStampGroupId + 3)._picResource;
_vm->_graphicsManager.sDrawPic(pic, *_vm->_graphicsManager._vPort, pt);
_vm->flipPageAndWait();
@ -1139,11 +1139,11 @@ void ThreadResource::doRoom() {
vm.makeViewFinderP();
voy._field437E = 0;
if (!vm._bVoy->getBoltGroup(vm._playStamp1, true))
if (!vm._bVoy->getBoltGroup(vm._playStampGroupId, true))
return;
vm._graphicsManager._backColors = vm._bVoy->boltEntry(vm._playStamp1 + 1)._cMapResource;
vm._graphicsManager._backgroundPage = vm._bVoy->boltEntry(vm._playStamp1)._picResource;
vm._graphicsManager._backColors = vm._bVoy->boltEntry(vm._playStampGroupId + 1)._cMapResource;
vm._graphicsManager._backgroundPage = vm._bVoy->boltEntry(vm._playStampGroupId)._picResource;
(*vm._graphicsManager._vPort)->setupViewPort(vm._graphicsManager._backgroundPage);
vm._graphicsManager._backColors->startFade();
@ -1151,12 +1151,12 @@ void ThreadResource::doRoom() {
voy._field437C = 0;
voy._field437E = 1;
byte *dataP = vm._bVoy->memberAddr(vm._playStamp1 + 4);
byte *dataP = vm._bVoy->memberAddr(vm._playStampGroupId + 4);
int count = READ_LE_UINT16(dataP);
int i4e4 = -1;
PictureResource *pic1 = vm._bVoy->boltEntry(vm._playStamp1 + 2)._picResource;
PictureResource *pic2 = vm._bVoy->boltEntry(vm._playStamp1 + 3)._picResource;
PictureResource *pic1 = vm._bVoy->boltEntry(vm._playStampGroupId + 2)._picResource;
PictureResource *pic2 = vm._bVoy->boltEntry(vm._playStampGroupId + 3)._picResource;
RectResource viewBounds(48, 38, 336, 202);
voy._viewBounds = &viewBounds;
@ -1164,11 +1164,11 @@ void ThreadResource::doRoom() {
vm._eventsManager.getMouseInfo();
vm._eventsManager.setMousePos(Common::Point(192, 120));
voy._field437E = 0;
vm._playStamp2 = 146;
vm._currentVocId = 146;
voy._field4AC = voy._RTVNum;
voy._vocSecondsOffset = 0;
vm._soundManager.startVOCPlay(vm._playStamp2);
vm._soundManager.startVOCPlay(vm._currentVocId);
voy._field478 &= ~1;
bool breakFlag = false;
@ -1178,10 +1178,10 @@ void ThreadResource::doRoom() {
vm._eventsManager._intPtr._hasPalette = true;
do {
if (vm._playStamp2 != -1 && !vm._soundManager.getVOCStatus()) {
if (vm._currentVocId != -1 && !vm._soundManager.getVOCStatus()) {
voy._field4AC = voy._RTVNum;
voy._vocSecondsOffset = 0;
vm._soundManager.startVOCPlay(vm._playStamp2);
vm._soundManager.startVOCPlay(vm._currentVocId);
}
vm._eventsManager.getMouseInfo();
@ -1239,7 +1239,7 @@ void ThreadResource::doRoom() {
if (i4e4 == 999) {
_vm->flipPageAndWait();
if (vm._playStamp2 != -1) {
if (vm._currentVocId != -1) {
voy._vocSecondsOffset = voy._RTVNum -
voy._field4AC;
vm._soundManager.stopVOCPlay();
@ -1268,16 +1268,16 @@ void ThreadResource::doRoom() {
// WORKAROUND: Done in original, but not now, since freeing and reloading
// the group would invalidate the _backgroundPage picture resource
//vm._bVoy->freeBoltGroup(vm._playStamp1);
//vm._bVoy->getBoltGroup(vm._playStamp1);
//vm._bVoy->freeBoltGroup(vm._playStampGroupId);
//vm._bVoy->getBoltGroup(vm._playStampGroupId);
dataP = vm._bVoy->memberAddr(vm._playStamp1 + 4);
pic1 = vm._bVoy->boltEntry(vm._playStamp1 + 2)._picResource;
pic2 = vm._bVoy->boltEntry(vm._playStamp1 + 3)._picResource;
dataP = vm._bVoy->memberAddr(vm._playStampGroupId + 4);
pic1 = vm._bVoy->boltEntry(vm._playStampGroupId + 2)._picResource;
pic2 = vm._bVoy->boltEntry(vm._playStampGroupId + 3)._picResource;
vm._graphicsManager._backColors = vm._bVoy->boltEntry(
vm._playStamp1 + 1)._cMapResource;
vm._playStampGroupId + 1)._cMapResource;
vm._graphicsManager._backgroundPage = vm._bVoy->boltEntry(
vm._playStamp1)._picResource;
vm._playStampGroupId)._picResource;
vm._graphicsManager._backColors->startFade();
_vm->flipPageAndWait();
@ -1320,14 +1320,14 @@ void ThreadResource::doRoom() {
voy._field47A = -1;
}
if (vm._playStamp1 != -1) {
vm._bVoy->freeBoltGroup(vm._playStamp1);
vm._playStamp1 = -1;
if (vm._playStampGroupId != -1) {
vm._bVoy->freeBoltGroup(vm._playStampGroupId);
vm._playStampGroupId = -1;
}
if (vm._playStamp2 != -1) {
if (vm._currentVocId != -1) {
vm._soundManager.stopVOCPlay();
vm._playStamp2 = -1;
vm._currentVocId = -1;
}
chooseSTAMPButton(0);
@ -1344,7 +1344,7 @@ int ThreadResource::doInterface() {
}
_vm->_voy._field478 &= ~0x100;
_vm->_playStamp1 = -1;
_vm->_playStampGroupId = -1;
_vm->_eventsManager._intPtr.field1E = 1;
_vm->_eventsManager._intPtr.field1A = 0;
@ -1374,11 +1374,11 @@ int ThreadResource::doInterface() {
_vm->initIFace();
Common::Array<Common::Rect> *hotspots = &_vm->_bVoy->boltEntry(
_vm->_playStamp1 + 1)._rectResource->_entries;
_vm->_playStamp2 = 151 - _vm->getRandomNumber(5);
_vm->_playStampGroupId + 1)._rectResource->_entries;
_vm->_currentVocId = 151 - _vm->getRandomNumber(5);
_vm->_voy._vocSecondsOffset = _vm->getRandomNumber(29);
Common::String fname = _vm->_soundManager.getVOCFileName(_vm->_playStamp2);
Common::String fname = _vm->_soundManager.getVOCFileName(_vm->_currentVocId);
_vm->_soundManager.startVOCPlay(fname);
_vm->_eventsManager.getMouseInfo();
@ -1412,8 +1412,8 @@ int ThreadResource::doInterface() {
_vm->checkPhoneCall();
if (!_vm->_soundManager.getVOCStatus()) {
_vm->_playStamp2 = 151 - _vm->getRandomNumber(5);
_vm->_soundManager.startVOCPlay(_vm->_soundManager.getVOCFileName(_vm->_playStamp2));
_vm->_currentVocId = 151 - _vm->getRandomNumber(5);
_vm->_soundManager.startVOCPlay(_vm->_soundManager.getVOCFileName(_vm->_currentVocId));
}
// Calculate the mouse position within the entire mansion
@ -1505,7 +1505,7 @@ int ThreadResource::doInterface() {
_vm->initIFace();
hotspots = &_vm->_bVoy->boltEntry(_vm->_playStamp1 + 1)._rectResource->_entries;
hotspots = &_vm->_bVoy->boltEntry(_vm->_playStampGroupId + 1)._rectResource->_entries;
_vm->_eventsManager.getMouseInfo();
_vm->_voy._field478 &= ~2;
@ -1518,8 +1518,8 @@ int ThreadResource::doInterface() {
_vm->_eventsManager.hideCursor();
_vm->_voy._field478 |= 1;
_vm->_bVoy->freeBoltGroup(_vm->_playStamp1);
if (_vm->_playStamp2 != -1)
_vm->_bVoy->freeBoltGroup(_vm->_playStampGroupId);
if (_vm->_currentVocId != -1)
_vm->_soundManager.stopVOCPlay();
return !_vm->_eventsManager._rightClick ? regionIndex : -2;
@ -1618,10 +1618,10 @@ void ThreadResource::loadTheApt() {
case 8:
case 9:
case 17:
_vm->_playStamp1 = 0x5700;
_vm->_playStampGroupId = 0x5700;
break;
case 3:
_vm->_playStamp1 = 0x5800;
_vm->_playStampGroupId = 0x5800;
break;
case 4:
case 10:
@ -1631,7 +1631,7 @@ void ThreadResource::loadTheApt() {
case 14:
case 15:
case 16:
_vm->_playStamp1 = 0x5900;
_vm->_playStampGroupId = 0x5900;
break;
default:
break;
@ -1642,21 +1642,21 @@ void ThreadResource::loadTheApt() {
if (_vm->_voy._field472 != -1) {
doAptAnim(1);
_vm->_bVoy->getBoltGroup(_vm->_playStamp1);
_vm->_bVoy->getBoltGroup(_vm->_playStampGroupId);
_vm->_voy._field472 = -1;
_vm->_graphicsManager._backgroundPage = _vm->_bVoy->boltEntry(
_vm->_playStamp1 + 5)._picResource;
_vm->_playStampGroupId + 5)._picResource;
(*_vm->_graphicsManager._vPort)->setupViewPort(
_vm->_graphicsManager._backgroundPage);
} else {
_vm->_bVoy->getBoltGroup(_vm->_playStamp1);
_vm->_bVoy->getBoltGroup(_vm->_playStampGroupId);
_vm->_graphicsManager._backgroundPage = _vm->_bVoy->boltEntry(
_vm->_playStamp1 + 5)._picResource;
_vm->_playStampGroupId + 5)._picResource;
(*_vm->_graphicsManager._vPort)->setupViewPort(
_vm->_graphicsManager._backgroundPage);
}
CMapResource *pal = _vm->_bVoy->boltEntry(_vm->_playStamp1 + 4)._cMapResource;
CMapResource *pal = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + 4)._cMapResource;
pal->_steps = 1;
pal->startFade();
_vm->flipPageAndWaitForFade();
@ -1668,9 +1668,9 @@ void ThreadResource::freeTheApt() {
_vm->_graphicsManager.fadeUpICF1(0);
if (_vm->_playStamp2 != -1) {
if (_vm->_currentVocId != -1) {
_vm->_soundManager.stopVOCPlay();
_vm->_playStamp2 = -1;
_vm->_currentVocId = -1;
}
if (_vm->_voy._field472 == -1) {
@ -1685,8 +1685,8 @@ void ThreadResource::freeTheApt() {
}
(*_vm->_graphicsManager._vPort)->setupViewPort(nullptr);
_vm->_bVoy->freeBoltGroup(_vm->_playStamp1);
_vm->_playStamp1 = -1;
_vm->_bVoy->freeBoltGroup(_vm->_playStampGroupId);
_vm->_playStampGroupId = -1;
_vm->_voy._viewBounds = nullptr;
}

2
engines/voyeur/voyeur.cpp
View File

@ -44,7 +44,7 @@ VoyeurEngine::VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc)
_controlPtr = NULL;
_bob = false;
_stampFlags = 0;
_playStamp1 = _playStamp2 = 0;
_playStampGroupId = _currentVocId = 0;
_videoId = -1;
_checkTransitionId = -1;
_gameHour = 0;

4
engines/voyeur/voyeur.h
View File

@ -158,8 +158,8 @@ public:
int _glGoStack;
bool _bob;
int _stampFlags;
int _playStamp1;
int _playStamp2;
int _playStampGroupId;
int _currentVocId;
int _videoId;
const int *_resolvePtr;
int _iForceDeath;

86
engines/voyeur/voyeur_game.cpp
View File

@ -48,7 +48,7 @@ void VoyeurEngine::playStamp() {
bool breakFlag = false;
while (!breakFlag && !shouldQuit()) {
_eventsManager.getMouseInfo();
_playStamp1 = _playStamp2 = -1;
_playStampGroupId = _currentVocId = -1;
_videoId = -1;
threadP->parsePlayCommands();
@ -142,17 +142,17 @@ void VoyeurEngine::playStamp() {
case 130: {
//_tmflag = 1;
if (_bVoy->getBoltGroup(_playStamp1)) {
_graphicsManager._backgroundPage = _bVoy->boltEntry(_playStamp1)._picResource;
_graphicsManager._backColors = _bVoy->boltEntry(_playStamp1 + 1)._cMapResource;
if (_bVoy->getBoltGroup(_playStampGroupId)) {
_graphicsManager._backgroundPage = _bVoy->boltEntry(_playStampGroupId)._picResource;
_graphicsManager._backColors = _bVoy->boltEntry(_playStampGroupId + 1)._cMapResource;
buttonId = getChooseButton();
if (_eventsManager._rightClick)
buttonId = 4;
_bVoy->freeBoltGroup(_playStamp1);
_bVoy->freeBoltGroup(_playStampGroupId);
_graphicsManager.screenReset();
_playStamp1 = -1;
_playStampGroupId = -1;
flag = true;
if (buttonId == 4) {
@ -174,9 +174,9 @@ void VoyeurEngine::playStamp() {
do {
if (flag) {
if (_playStamp2 != -1) {
if (_currentVocId != -1) {
_soundManager.stopVOCPlay();
_playStamp2 = -1;
_currentVocId = -1;
}
_videoId = -1;
@ -186,9 +186,9 @@ void VoyeurEngine::playStamp() {
_voy._field47A = -1;
}
if (_playStamp1 != -1) {
_bVoy->freeBoltGroup(_playStamp1);
_playStamp1 = -1;
if (_playStampGroupId != -1) {
_bVoy->freeBoltGroup(_playStampGroupId);
_playStampGroupId = -1;
}
// Break out of loop
@ -469,13 +469,13 @@ void VoyeurEngine::reviewTape() {
_eventsManager.setMousePos(Common::Point(newX, newY));
}
_playStamp2 = 151;
_currentVocId = 151;
_voy._vocSecondsOffset = 0;
bool var1E = true;
do {
if (_playStamp2 != -1 && !_soundManager.getVOCStatus()) {
if (_currentVocId != -1 && !_soundManager.getVOCStatus()) {
_voy._field4AC = _voy._RTVNum;
_soundManager.startVOCPlay(_playStamp2);
_soundManager.startVOCPlay(_currentVocId);
}
if (var1E) {
@ -886,7 +886,7 @@ void VoyeurEngine::playAVideoEvent(int eventIndex) {
int VoyeurEngine::getChooseButton() {
int prevIndex = -2;
Common::Array<Common::Rect> &hotspots = _bVoy->boltEntry(_playStamp1
Common::Array<Common::Rect> &hotspots = _bVoy->boltEntry(_playStampGroupId
+ 6)._rectResource->_entries;
int selectedIndex = -1;
@ -895,13 +895,13 @@ int VoyeurEngine::getChooseButton() {
_graphicsManager._backColors->startFade();
flipPageAndWait();
_voy._viewBounds = _bVoy->boltEntry(_playStamp1 + 7)._rectResource;
PictureResource *cursorPic = _bVoy->boltEntry(_playStamp1 + 2)._picResource;
_voy._viewBounds = _bVoy->boltEntry(_playStampGroupId + 7)._rectResource;
PictureResource *cursorPic = _bVoy->boltEntry(_playStampGroupId + 2)._picResource;
do {
do {
if (_playStamp2 != -1 && !_soundManager.getVOCStatus())
_soundManager.startVOCPlay(_playStamp2);
if (_currentVocId != -1 && !_soundManager.getVOCStatus())
_soundManager.startVOCPlay(_currentVocId);
_eventsManager.getMouseInfo();
selectedIndex = -1;
@ -912,19 +912,19 @@ int VoyeurEngine::getChooseButton() {
if (!_voy._field4F0 || (idx + 1) != READ_LE_UINT32(_controlPtr->_ptr + 4)) {
selectedIndex = idx;
if (selectedIndex != prevIndex) {
PictureResource *btnPic = _bVoy->boltEntry(_playStamp1 + 8 + idx)._picResource;
PictureResource *btnPic = _bVoy->boltEntry(_playStampGroupId + 8 + idx)._picResource;
_graphicsManager.sDrawPic(btnPic, *_graphicsManager._vPort,
Common::Point(106, 200));
cursorPic = _bVoy->boltEntry(_playStamp1 + 4)._picResource;
cursorPic = _bVoy->boltEntry(_playStampGroupId + 4)._picResource;
}
}
}
}
if (selectedIndex == -1) {
cursorPic = _bVoy->boltEntry(_playStamp1 + 2)._picResource;
PictureResource *btnPic = _bVoy->boltEntry(_playStamp1 + 12)._picResource;
cursorPic = _bVoy->boltEntry(_playStampGroupId + 2)._picResource;
PictureResource *btnPic = _bVoy->boltEntry(_playStampGroupId + 12)._picResource;
_graphicsManager.sDrawPic(btnPic, *_graphicsManager._vPort,
Common::Point(106, 200));
}
@ -994,7 +994,7 @@ void VoyeurEngine::makeViewFinderP() {
}
void VoyeurEngine::initIFace(){
int playStamp1 = _playStamp1;
int playStamp1 = _playStampGroupId;
switch (_voy._transitionId) {
case 0:
break;
@ -1005,20 +1005,20 @@ void VoyeurEngine::initIFace(){
case 7:
case 8:
case 9:
_playStamp1 = 0xB00;
_playStampGroupId = 0xB00;
break;
case 3:
_playStamp1 = 0xC00;
_playStampGroupId = 0xC00;
break;
default:
_playStamp1 = 0xD00;
_playStampGroupId = 0xD00;
break;
}
if (playStamp1 != -1)
_bVoy->freeBoltGroup(playStamp1, true);
_bVoy->getBoltGroup(_playStamp1);
CMapResource *pal = _bVoy->boltEntry(_playStamp1 + 2)._cMapResource;
_bVoy->getBoltGroup(_playStampGroupId);
CMapResource *pal = _bVoy->boltEntry(_playStampGroupId + 2)._cMapResource;
pal->startFade();
// Start the mansion off centered
@ -1026,7 +1026,7 @@ void VoyeurEngine::initIFace(){
(MANSION_MAX_Y - MANSION_VIEW_HEIGHT) / 2);
doScroll(_mansionViewPos);
_voy._viewBounds = _bVoy->boltEntry(_playStamp1)._rectResource;
_voy._viewBounds = _bVoy->boltEntry(_playStampGroupId)._rectResource;
// Show the cursor using ScummVM functionality
_eventsManager.showCursor();
@ -1136,16 +1136,16 @@ bool VoyeurEngine::doComputerText(int maxLen) {
_voy._vocSecondsOffset = 0;
if (_voy._RTVNum > _voy._field4EE && maxLen == 9999) {
if (_playStamp2 != -1)
_soundManager.startVOCPlay(_playStamp2);
if (_currentVocId != -1)
_soundManager.startVOCPlay(_currentVocId);
font._justify = ALIGN_LEFT;
font._justifyWidth = 384;
font._justifyHeight = 100;
font._pos = Common::Point(128, 100);
(*_graphicsManager._vPort)->drawText(END_OF_MESSAGE);
} else if (_voy._RTVNum < _voy._field4EC && maxLen == 9999) {
if (_playStamp2 != -1)
_soundManager.startVOCPlay(_playStamp2);
if (_currentVocId != -1)
_soundManager.startVOCPlay(_currentVocId);
font._justify = ALIGN_LEFT;
font._justifyWidth = 384;
font._justifyHeight = 100;
@ -1158,10 +1158,10 @@ bool VoyeurEngine::doComputerText(int maxLen) {
bool showEnd = true;
int yp = 60;
do {
if (_playStamp2 != -1 && !_soundManager.getVOCStatus()) {
if (_currentVocId != -1 && !_soundManager.getVOCStatus()) {
if (_voy._vocSecondsOffset > 60)
_voy._vocSecondsOffset = 0;
_soundManager.startVOCPlay(_playStamp2);
_soundManager.startVOCPlay(_currentVocId);
}
char c = *msg++;
@ -1270,17 +1270,17 @@ void VoyeurEngine::flashTimeBar(){
void VoyeurEngine::checkPhoneCall() {
if ((_voy._RTVLimit - _voy._RTVNum) >= 36 && _voy._field4B8 < 5 &&
_playStamp2 <= 151 && _playStamp2 > 146) {
_currentVocId <= 151 && _currentVocId > 146) {
if ((_voy._switchBGNum < _checkPhoneVal || _checkPhoneVal > 180) &&
!_soundManager.getVOCStatus()) {
int soundIndex;
do {
soundIndex = getRandomNumber(4);
} while (_voy._field4AE[soundIndex]);
_playStamp2 = 154 + soundIndex;
_currentVocId = 154 + soundIndex;
_soundManager.stopVOCPlay();
_soundManager.startVOCPlay(_playStamp2);
_soundManager.startVOCPlay(_currentVocId);
_checkPhoneVal = _voy._switchBGNum;
++_voy._field4AE[soundIndex];
++_voy._field4B8;
@ -1292,7 +1292,7 @@ void VoyeurEngine::doEvidDisplay(int evidId, int eventId) {
_eventsManager.getMouseInfo();
flipPageAndWait();
if (_playStamp2 != -1) {
if (_currentVocId != -1) {
_voy._vocSecondsOffset = _voy._RTVNum - _voy._field4AC;
_soundManager.stopVOCPlay();
}
@ -1310,7 +1310,7 @@ void VoyeurEngine::doEvidDisplay(int evidId, int eventId) {
_eventsManager.delay(1);
_bVoy->freeBoltMember(_voy._field47A + evidId * 2 + 1);
byte *dataP = _bVoy->memberAddr(_playStamp1 + 4);
byte *dataP = _bVoy->memberAddr(_playStampGroupId + 4);
int count = (int16)READ_LE_UINT16(dataP + evidId * 12 + 4);
if (count > 0) {
@ -1334,11 +1334,11 @@ void VoyeurEngine::doEvidDisplay(int evidId, int eventId) {
int evidIdx = evidId;
while (!shouldQuit() && !_eventsManager._rightClick) {
if (_playStamp2 != -1 && !_soundManager.getVOCStatus()) {
if (_currentVocId != -1 && !_soundManager.getVOCStatus()) {
if (_voy._vocSecondsOffset > 60)
_voy._vocSecondsOffset = 0;
_soundManager.startVOCPlay(_playStamp2);
_soundManager.startVOCPlay(_currentVocId);
}
_eventsManager.delayClick(600);