diff options
author | Strangerke | 2014-02-27 07:29:49 +0100 |
---|---|---|
committer | Strangerke | 2014-02-27 07:29:49 +0100 |
commit | 9f74d13c57033f5cf60b711021f0b0b1e8697f9e (patch) | |
tree | d4e554e4f8a96a3cd40bcf9de8c690be2274b868 /engines/voyeur/graphics.cpp | |
parent | 9278ec342caf1c47ca5882103bb587ec40ab93e6 (diff) | |
download | scummvm-rg350-9f74d13c57033f5cf60b711021f0b0b1e8697f9e.tar.gz scummvm-rg350-9f74d13c57033f5cf60b711021f0b0b1e8697f9e.tar.bz2 scummvm-rg350-9f74d13c57033f5cf60b711021f0b0b1e8697f9e.zip |
VOYEUR: Remove setVm from EventManager
Diffstat (limited to 'engines/voyeur/graphics.cpp')
-rw-r--r-- | engines/voyeur/graphics.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp index 0f70a23cf2..a4dc27bd02 100644 --- a/engines/voyeur/graphics.cpp +++ b/engines/voyeur/graphics.cpp @@ -845,7 +845,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des } if (cursorData) { - _vm->_eventsManager.setCursor(cursorData, width2, height1); + _vm->_eventsManager->setCursor(cursorData, width2, height1); delete[] cursorData; } } @@ -877,7 +877,7 @@ void GraphicsManager::fillPic(DisplayResource *display, byte onOff) { * Queues the given picture for display */ void GraphicsManager::sDisplayPic(PictureResource *pic) { - _vm->_eventsManager._intPtr._flipWait = true; + _vm->_eventsManager->_intPtr._flipWait = true; } void GraphicsManager::flipPage() { @@ -940,7 +940,7 @@ void GraphicsManager::clearPalette() { void GraphicsManager::setPalette(const byte *palette, int start, int count) { g_system->getPaletteManager()->setPalette(palette, start, count); - _vm->_eventsManager._gameData._hasPalette = false; + _vm->_eventsManager->_gameData._hasPalette = false; } void GraphicsManager::setPalette128(const byte *palette, int start, int count) { @@ -955,7 +955,7 @@ void GraphicsManager::resetPalette() { for (int i = 0; i < 256; ++i) setColor(i, 0, 0, 0); - _vm->_eventsManager._intPtr._hasPalette = true; + _vm->_eventsManager->_intPtr._hasPalette = true; } void GraphicsManager::setColor(int idx, byte r, byte g, byte b) { @@ -964,8 +964,8 @@ void GraphicsManager::setColor(int idx, byte r, byte g, byte b) { vgaP[1] = g; vgaP[2] = b; - _vm->_eventsManager._intPtr._palStartIndex = MIN(_vm->_eventsManager._intPtr._palStartIndex, idx); - _vm->_eventsManager._intPtr._palEndIndex = MAX(_vm->_eventsManager._intPtr._palEndIndex, idx); + _vm->_eventsManager->_intPtr._palStartIndex = MIN(_vm->_eventsManager->_intPtr._palStartIndex, idx); + _vm->_eventsManager->_intPtr._palEndIndex = MAX(_vm->_eventsManager->_intPtr._palEndIndex, idx); } void GraphicsManager::setOneColor(int idx, byte r, byte g, byte b) { @@ -984,7 +984,7 @@ void GraphicsManager::setColors(int start, int count, const byte *pal) { } } - _vm->_eventsManager._intPtr._hasPalette = true; + _vm->_eventsManager->_intPtr._hasPalette = true; } void GraphicsManager::screenReset() { @@ -1003,7 +1003,7 @@ void GraphicsManager::fadeDownICF1(int steps) { for (int idx = 0; idx < steps; ++idx) { _vm->_voy->_fadingAmount2 -= stepAmount; - _vm->_eventsManager.delay(1); + _vm->_eventsManager->delay(1); } } @@ -1016,7 +1016,7 @@ void GraphicsManager::fadeUpICF1(int steps) { for (int idx = 0; idx < steps; ++idx) { _vm->_voy->_fadingAmount2 += stepAmount; - _vm->_eventsManager.delay(1); + _vm->_eventsManager->delay(1); } } @@ -1025,14 +1025,14 @@ void GraphicsManager::fadeUpICF1(int steps) { void GraphicsManager::fadeDownICF(int steps) { if (steps > 0) { - _vm->_eventsManager.hideCursor(); + _vm->_eventsManager->hideCursor(); int stepAmount1 = _vm->_voy->_fadingAmount1 / steps; int stepAmount2 = _vm->_voy->_fadingAmount2 / steps; for (int idx = 0; idx < steps; ++idx) { _vm->_voy->_fadingAmount1 -= stepAmount1; _vm->_voy->_fadingAmount2 -= stepAmount2; - _vm->_eventsManager.delay(1); + _vm->_eventsManager->delay(1); } } |