aboutsummaryrefslogtreecommitdiff
path: root/engines/voyeur/files_threads.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/voyeur/files_threads.cpp')
-rw-r--r--engines/voyeur/files_threads.cpp74
1 files changed, 37 insertions, 37 deletions
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 385e61ecee..603eb64a35 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -458,7 +458,7 @@ void ThreadResource::parsePlayCommands() {
pic = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + i * 2)._picResource;
pal = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + i * 2 + 1)._cMapResource;
- (*_vm->_graphicsManager._vPort)->setupViewPort(pic);
+ (*_vm->_graphicsManager->_vPort)->setupViewPort(pic);
pal->startFade();
_vm->flipPageAndWaitForFade();
@@ -977,10 +977,10 @@ int ThreadResource::doApt() {
_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);
- _vm->_graphicsManager.setColor(131, 215, 215, 215);
- _vm->_graphicsManager.setColor(132, 235, 235, 235);
+ _vm->_graphicsManager->setColor(129, 82, 82, 82);
+ _vm->_graphicsManager->setColor(130, 112, 112, 112);
+ _vm->_graphicsManager->setColor(131, 215, 215, 215);
+ _vm->_graphicsManager->setColor(132, 235, 235, 235);
_vm->_eventsManager->_intPtr._hasPalette = true;
@@ -1030,7 +1030,7 @@ int ThreadResource::doApt() {
// Draw the text description for the highlighted hotspot
pic = _vm->_bVoy->boltEntry(_vm->_playStampGroupId +
hotspotId + 6)._picResource;
- _vm->_graphicsManager.sDrawPic(pic, *_vm->_graphicsManager._vPort,
+ _vm->_graphicsManager->sDrawPic(pic, *_vm->_graphicsManager->_vPort,
Common::Point(106, 200));
}
@@ -1045,7 +1045,7 @@ int ThreadResource::doApt() {
// Draw either standard or highlighted eye cursor
pic = _vm->_bVoy->boltEntry((hotspotId == -1) ? _vm->_playStampGroupId + 2 :
_vm->_playStampGroupId + 3)._picResource;
- _vm->_graphicsManager.sDrawPic(pic, *_vm->_graphicsManager._vPort, pt);
+ _vm->_graphicsManager->sDrawPic(pic, *_vm->_graphicsManager->_vPort, pt);
_vm->flipPageAndWait();
@@ -1098,10 +1098,10 @@ void ThreadResource::doRoom() {
if (!vm._bVoy->getBoltGroup(vm._playStampGroupId, true))
return;
- 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();
+ 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();
voy._fadingStep1 = 2;
voy._fadingStep2 = 0;
@@ -1130,7 +1130,7 @@ void ThreadResource::doRoom() {
bool breakFlag = false;
while (!vm.shouldQuit() && !breakFlag) {
_vm->_voyeurArea = AREA_ROOM;
- vm._graphicsManager.setColor(128, 0, 255, 0);
+ vm._graphicsManager->setColor(128, 0, 255, 0);
vm._eventsManager->_intPtr._hasPalette = true;
do {
@@ -1171,7 +1171,7 @@ void ThreadResource::doRoom() {
}
vm._eventsManager->_intPtr._hasPalette = true;
- vm._graphicsManager.flipPage();
+ vm._graphicsManager->flipPage();
vm._eventsManager->sWaitFlip();
} while (!vm.shouldQuit() && !vm._eventsManager->_mouseClicked);
@@ -1219,13 +1219,13 @@ void ThreadResource::doRoom() {
// WORKAROUND: Skipped code from the original, that freed the group,
// reloaded it, and reloaded the cursors
- vm._graphicsManager._backColors = vm._bVoy->boltEntry(
+ vm._graphicsManager->_backColors = vm._bVoy->boltEntry(
vm._playStampGroupId + 1)._cMapResource;
- vm._graphicsManager._backgroundPage = vm._bVoy->boltEntry(
+ vm._graphicsManager->_backgroundPage = vm._bVoy->boltEntry(
vm._playStampGroupId)._picResource;
- (*vm._graphicsManager._vPort)->setupViewPort();
- vm._graphicsManager._backColors->startFade();
+ (*vm._graphicsManager->_vPort)->setupViewPort();
+ vm._graphicsManager->_backColors->startFade();
_vm->flipPageAndWait();
while (!vm.shouldQuit() && (vm._eventsManager->_fadeStatus & 1))
@@ -1250,7 +1250,7 @@ void ThreadResource::doRoom() {
_vm->flipPageAndWait();
- vm._graphicsManager.fadeUpICF1();
+ vm._graphicsManager->fadeUpICF1();
voy._eventFlags &= EVTFLAG_RECORDING;
vm._eventsManager->showCursor();
}
@@ -1332,7 +1332,7 @@ int ThreadResource::doInterface() {
_vm->_soundManager->startVOCPlay(fname);
_vm->_eventsManager->getMouseInfo();
- _vm->_graphicsManager.setColor(240, 220, 220, 220);
+ _vm->_graphicsManager->setColor(240, 220, 220, 220);
_vm->_eventsManager->_intPtr._hasPalette = true;
_vm->_voy->_eventFlags &= ~EVTFLAG_TIME_DISABLED;
@@ -1406,20 +1406,20 @@ int ThreadResource::doInterface() {
// Regularly update the time display
if (_vm->_voy->_RTANum & 2) {
- _vm->_graphicsManager.drawANumber(*_vm->_graphicsManager._vPort,
+ _vm->_graphicsManager->drawANumber(*_vm->_graphicsManager->_vPort,
_vm->_gameMinute / 10, Common::Point(190, 25));
- _vm->_graphicsManager.drawANumber(*_vm->_graphicsManager._vPort,
+ _vm->_graphicsManager->drawANumber(*_vm->_graphicsManager->_vPort,
_vm->_gameMinute % 10, Common::Point(201, 25));
if (_vm->_voy->_RTANum & 4) {
int v = _vm->_gameHour / 10;
- _vm->_graphicsManager.drawANumber(*_vm->_graphicsManager._vPort,
+ _vm->_graphicsManager->drawANumber(*_vm->_graphicsManager->_vPort,
v == 0 ? 10 : v, Common::Point(161, 25));
- _vm->_graphicsManager.drawANumber(*_vm->_graphicsManager._vPort,
+ _vm->_graphicsManager->drawANumber(*_vm->_graphicsManager->_vPort,
_vm->_gameHour % 10, Common::Point(172, 25));
pic = _vm->_bVoy->boltEntry(_vm->_voy->_isAM ? 272 : 273)._picResource;
- _vm->_graphicsManager.sDrawPic(pic, *_vm->_graphicsManager._vPort,
+ _vm->_graphicsManager->sDrawPic(pic, *_vm->_graphicsManager->_vPort,
Common::Point(215, 27));
}
}
@@ -1585,16 +1585,16 @@ void ThreadResource::loadTheApt() {
doAptAnim(1);
_vm->_bVoy->getBoltGroup(_vm->_playStampGroupId);
_vm->_voy->_aptLoadMode = -1;
- _vm->_graphicsManager._backgroundPage = _vm->_bVoy->boltEntry(
+ _vm->_graphicsManager->_backgroundPage = _vm->_bVoy->boltEntry(
_vm->_playStampGroupId + 5)._picResource;
- (*_vm->_graphicsManager._vPort)->setupViewPort(
- _vm->_graphicsManager._backgroundPage);
+ (*_vm->_graphicsManager->_vPort)->setupViewPort(
+ _vm->_graphicsManager->_backgroundPage);
} else {
_vm->_bVoy->getBoltGroup(_vm->_playStampGroupId);
- _vm->_graphicsManager._backgroundPage = _vm->_bVoy->boltEntry(
+ _vm->_graphicsManager->_backgroundPage = _vm->_bVoy->boltEntry(
_vm->_playStampGroupId + 5)._picResource;
- (*_vm->_graphicsManager._vPort)->setupViewPort(
- _vm->_graphicsManager._backgroundPage);
+ (*_vm->_graphicsManager->_vPort)->setupViewPort(
+ _vm->_graphicsManager->_backgroundPage);
}
CMapResource *pal = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + 4)._cMapResource;
@@ -1604,10 +1604,10 @@ void ThreadResource::loadTheApt() {
}
void ThreadResource::freeTheApt() {
- _vm->_graphicsManager.fadeDownICF1(5);
+ _vm->_graphicsManager->fadeDownICF1(5);
_vm->flipPageAndWaitForFade();
- _vm->_graphicsManager.fadeUpICF1();
+ _vm->_graphicsManager->fadeUpICF1();
if (_vm->_currentVocId != -1) {
_vm->_soundManager->stopVOCPlay();
@@ -1615,17 +1615,17 @@ void ThreadResource::freeTheApt() {
}
if (_vm->_voy->_aptLoadMode == -1) {
- _vm->_graphicsManager.fadeDownICF(6);
+ _vm->_graphicsManager->fadeDownICF(6);
} else {
doAptAnim(2);
}
if (_vm->_voy->_aptLoadMode == 140) {
- _vm->_graphicsManager.screenReset();
- _vm->_graphicsManager.resetPalette();
+ _vm->_graphicsManager->screenReset();
+ _vm->_graphicsManager->resetPalette();
}
- (*_vm->_graphicsManager._vPort)->setupViewPort(nullptr);
+ (*_vm->_graphicsManager->_vPort)->setupViewPort(nullptr);
_vm->_bVoy->freeBoltGroup(_vm->_playStampGroupId);
_vm->_playStampGroupId = -1;
_vm->_voy->_viewBounds = nullptr;
@@ -1685,7 +1685,7 @@ void ThreadResource::doAptAnim(int mode) {
for (int idx = 0; (idx < 6) && !_vm->shouldQuit(); ++idx) {
PictureResource *pic = _vm->_bVoy->boltEntry(id + idx + 1)._picResource;
- (*_vm->_graphicsManager._vPort)->setupViewPort(pic);
+ (*_vm->_graphicsManager->_vPort)->setupViewPort(pic);
pal->startFade();
_vm->flipPageAndWait();