aboutsummaryrefslogtreecommitdiff
path: root/engines/voyeur
diff options
context:
space:
mode:
Diffstat (limited to 'engines/voyeur')
-rw-r--r--engines/voyeur/data.h2
-rw-r--r--engines/voyeur/events.cpp2
-rw-r--r--engines/voyeur/files_threads.cpp26
-rw-r--r--engines/voyeur/voyeur.cpp10
-rw-r--r--engines/voyeur/voyeur_game.cpp14
5 files changed, 27 insertions, 27 deletions
diff --git a/engines/voyeur/data.h b/engines/voyeur/data.h
index 8b561e9a29..2dc1221b9c 100644
--- a/engines/voyeur/data.h
+++ b/engines/voyeur/data.h
@@ -34,7 +34,7 @@ namespace Voyeur {
enum VoyeurEventType { EVTYPE_VIDEO = 1, EVTYPE_AUDIO = 2, EVTYPE_EVID = 3,
EVTYPE_COMPUTER = 4 };
-enum EventFlag { EVTFLAG_1 = 1, EVTFLAG_2 = 2, EVTFLAG_8 = 8, EVTFLAG_RECORDING = 0x10,
+enum EventFlag { EVTFLAG_TIME_DISABLED = 1, EVTFLAG_2 = 2, EVTFLAG_8 = 8, EVTFLAG_RECORDING = 0x10,
EVTFLAG_40 = 0x40, EVTFLAG_100 = 0x100 };
struct VoyeurEvent {
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 3fe37ca22b..4734b1efa3 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -102,7 +102,7 @@ void EventsManager::startMainClockInt() {
}
void EventsManager::mainVoyeurIntFunc() {
- if (!(_vm->_voy._eventFlags & EVTFLAG_1)) {
+ if (!(_vm->_voy._eventFlags & EVTFLAG_TIME_DISABLED)) {
++_vm->_voy._switchBGNum;
if (_vm->_debugger._isTimeActive) {
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 36b3376c32..6c39a97689 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -410,12 +410,12 @@ void ThreadResource::parsePlayCommands() {
} else {
_vm->_voy._vocSecondsOffset = _vm->_voy._RTVNum - _vm->_voy._field468;
_vm->_voy.addVideoEventStart();
- _vm->_voy._eventFlags &= ~EVTFLAG_1;
+ _vm->_voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
_vm->_voy._eventFlags |= EVTFLAG_RECORDING;
_vm->playAVideo(_vm->_audioVideoId);
_vm->_voy._eventFlags &= ~EVTFLAG_RECORDING;
- _vm->_voy._eventFlags |= EVTFLAG_1;
+ _vm->_voy._eventFlags |= EVTFLAG_TIME_DISABLED;
_vm->_voy.addVideoEventEnd();
_vm->_eventsManager.incrementTime(1);
@@ -454,9 +454,9 @@ void ThreadResource::parsePlayCommands() {
_vm->_voy._vocSecondsOffset = 0;
_vm->_voy._field468 = _vm->_voy._RTVNum;
- _vm->_voy._eventFlags &= ~(EVTFLAG_1 | EVTFLAG_RECORDING);
+ _vm->_voy._eventFlags &= ~(EVTFLAG_TIME_DISABLED | EVTFLAG_RECORDING);
_vm->playAVideo(_vm->_audioVideoId);
- _vm->_voy._eventFlags |= EVTFLAG_1;
+ _vm->_voy._eventFlags |= EVTFLAG_TIME_DISABLED;
if (id != 22) {
_vm->_audioVideoId = -1;
@@ -1115,7 +1115,7 @@ void ThreadResource::doRoom() {
voy._vocSecondsOffset = 0;
vm._soundManager.startVOCPlay(vm._currentVocId);
- voy._eventFlags &= ~EVTFLAG_1;
+ voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
bool breakFlag = false;
while (!vm.shouldQuit() && !breakFlag) {
@@ -1248,7 +1248,7 @@ void ThreadResource::doRoom() {
}
}
- voy._eventFlags = EVTFLAG_1;
+ voy._eventFlags = EVTFLAG_TIME_DISABLED;
vm._eventsManager.incrementTime(1);
voy._viewBounds = nullptr;
voy._field437E = 0;
@@ -1277,7 +1277,7 @@ int ThreadResource::doInterface() {
PictureResource *pic;
Common::Point pt;
- _vm->_voy._eventFlags |= EVTFLAG_1;
+ _vm->_voy._eventFlags |= EVTFLAG_TIME_DISABLED;
if (_vm->_voy._field46E) {
_vm->_voy._field46E = false;
return -2;
@@ -1298,14 +1298,14 @@ int ThreadResource::doInterface() {
_vm->initIFace();
_vm->_voy._RTVNum = _vm->_voy._RTVLimit - 4;
- _vm->_voy._eventFlags &= ~EVTFLAG_1;
+ _vm->_voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
while (!_vm->shouldQuit() && _vm->_voy._RTVNum < _vm->_voy._RTVLimit) {
_vm->flashTimeBar();
_vm->_eventsManager.delayClick(1);
}
- _vm->_voy._eventFlags |= EVTFLAG_1;
+ _vm->_voy._eventFlags |= EVTFLAG_TIME_DISABLED;
chooseSTAMPButton(20);
parsePlayCommands();
}
@@ -1327,7 +1327,7 @@ int ThreadResource::doInterface() {
_vm->_graphicsManager.setColor(240, 220, 220, 220);
_vm->_eventsManager._intPtr._palChanged = true;
_vm->_eventsManager._intPtr._hasPalette = true;
- _vm->_voy._eventFlags &= ~EVTFLAG_1;
+ _vm->_voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
// Set the cusor
PictureResource *crosshairsCursor = _vm->_bVoy->boltEntry(0x112)._picResource;
@@ -1436,7 +1436,7 @@ int ThreadResource::doInterface() {
_vm->checkTransition();
_vm->_eventsManager._leftClick = true;
} else {
- _vm->_voy._eventFlags |= EVTFLAG_1;
+ _vm->_voy._eventFlags |= EVTFLAG_TIME_DISABLED;
chooseSTAMPButton(20);
parsePlayCommands();
@@ -1448,7 +1448,7 @@ int ThreadResource::doInterface() {
hotspots = &_vm->_bVoy->boltEntry(_vm->_playStampGroupId + 1)._rectResource->_entries;
_vm->_eventsManager.getMouseInfo();
- _vm->_voy._eventFlags &= ~2;
+ _vm->_voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
_vm->_eventsManager._intPtr.field1E = 1;
_vm->_eventsManager._intPtr.field1A = 0;
}
@@ -1457,7 +1457,7 @@ int ThreadResource::doInterface() {
(!_vm->_eventsManager._leftClick || regionIndex == -1));
_vm->_eventsManager.hideCursor();
- _vm->_voy._eventFlags |= EVTFLAG_1;
+ _vm->_voy._eventFlags |= EVTFLAG_TIME_DISABLED;
_vm->_bVoy->freeBoltGroup(_vm->_playStampGroupId);
if (_vm->_currentVocId != -1)
_vm->_soundManager.stopVOCPlay();
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index d4a947555c..27a45d8fcf 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -117,7 +117,7 @@ void VoyeurEngine::globalInitBolt() {
assert(_graphicsManager._fontPtr->_curFont);
// Setup default flags
- _voy._eventFlags = EVTFLAG_1;
+ _voy._eventFlags = EVTFLAG_TIME_DISABLED;
_voy._field4376 = _voy._field4378 = 127;
_voy._field4F2 = 9999;
_voy._aptLoadMode = -1;
@@ -463,7 +463,7 @@ void VoyeurEngine::doOpening() {
_eventsManager._videoDead = -1;
_voy.addVideoEventStart();
- _voy._eventFlags &= ~EVTFLAG_1;
+ _voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
for (int i = 0; i < 256; ++i)
_graphicsManager.setColor(i, 8, 8, 8);
@@ -498,7 +498,7 @@ void VoyeurEngine::doOpening() {
if ((_voy._RTVNum - _voy._field468) < 2)
_eventsManager.delay(60);
- _voy._eventFlags |= EVTFLAG_1;
+ _voy._eventFlags |= EVTFLAG_TIME_DISABLED;
_voy.addVideoEventEnd();
_voy._eventFlags &= EVTFLAG_RECORDING;
@@ -600,7 +600,7 @@ void VoyeurEngine::playAudio(int audioId) {
_graphicsManager._backColors->startFade();
flipPageAndWaitForFade();
- _voy._eventFlags &= ~EVTFLAG_1;
+ _voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
_soundManager.setVOCOffset(_voy._vocSecondsOffset);
Common::String filename = _soundManager.getVOCFileName(
audioId + 159);
@@ -612,7 +612,7 @@ void VoyeurEngine::playAudio(int audioId) {
_soundManager.getVOCStatus())
_eventsManager.delayClick(1);
- _voy._eventFlags |= EVTFLAG_1;
+ _voy._eventFlags |= EVTFLAG_TIME_DISABLED;
_soundManager.stopVOCPlay();
_bVoy->freeBoltGroup(0x7F00);
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index e986118132..473224bf7a 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -65,19 +65,19 @@ void VoyeurEngine::playStamp() {
_voy._aptLoadMode = 140;
break;
case 1:
- _voy._eventFlags &= ~EVTFLAG_1;
+ _voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
_voy._field46E = true;
_mainThread->chooseSTAMPButton(22);
_voy._aptLoadMode = 143;
break;
case 2:
- _voy._eventFlags &= ~EVTFLAG_1;
+ _voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
reviewTape();
_voy._field46E = true;
_voy._aptLoadMode = 142;
break;
case 3:
- _voy._eventFlags &= ~EVTFLAG_1;
+ _voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
_mainThread->chooseSTAMPButton(21);
break;
case 4:
@@ -683,7 +683,7 @@ void VoyeurEngine::reviewTape() {
_eventsManager._intPtr.field1E = 1;
_eventsManager._intPtr.field1A = 0;
- _voy._eventFlags &= ~EVTFLAG_1;
+ _voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
// Play suond for the given duration
_soundManager.setVOCOffset(_voy._vocSecondsOffset);
@@ -697,7 +697,7 @@ void VoyeurEngine::reviewTape() {
_eventsManager.delay(10);
}
- _voy._eventFlags |= EVTFLAG_1;
+ _voy._eventFlags |= EVTFLAG_TIME_DISABLED;
_soundManager.stopVOCPlay();
_bVoy->freeBoltGroup(0x7F00);
break;
@@ -902,11 +902,11 @@ void VoyeurEngine::playAVideoEvent(int eventIndex) {
_audioVideoId = evt._audioVideoId;
_voy._vocSecondsOffset = evt._computerOn;
_eventsManager._videoDead = evt._dead;
- _voy._eventFlags &= ~EVTFLAG_1;
+ _voy._eventFlags &= ~EVTFLAG_TIME_DISABLED;
playAVideoDuration(_audioVideoId, evt._computerOff);
- _voy._eventFlags |= EVTFLAG_1;
+ _voy._eventFlags |= EVTFLAG_TIME_DISABLED;
if (_eventsManager._videoDead != -1) {
_bVoy->freeBoltGroup(0xE00);
_eventsManager._videoDead = -1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-11 00:51:30 +0000