From 260a6bbc24ef45af5cb6f52a6dfe7330aea542c1 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 9 Apr 2013 09:47:48 -0400 Subject: HOPKINS: Renamed remaining GraphicsManager methods --- engines/hopkins/anim.cpp | 12 ++++++------ engines/hopkins/computer.cpp | 6 +++--- engines/hopkins/events.cpp | 2 +- engines/hopkins/font.cpp | 2 +- engines/hopkins/graphics.cpp | 40 ++++++++++++++++++++-------------------- engines/hopkins/graphics.h | 14 +++++++------- engines/hopkins/objects.cpp | 6 +++--- engines/hopkins/script.cpp | 2 +- engines/hopkins/talk.cpp | 14 +++++++------- 9 files changed, 49 insertions(+), 49 deletions(-) (limited to 'engines') diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index b66f6fa318..9f898a6715 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -93,7 +93,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui } else { _vm->_graphicsManager->setPaletteVGA256(_vm->_graphicsManager->_palette); _vm->_graphicsManager->lockScreen(); - _vm->_graphicsManager->m_scroll16(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + _vm->_graphicsManager->copy16BitRect(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); _vm->_graphicsManager->unlockScreen(); _vm->_graphicsManager->addRefreshRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); @@ -249,7 +249,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u _vm->_graphicsManager->_maxX = SCREEN_WIDTH; _vm->_graphicsManager->setPaletteVGA256(_vm->_graphicsManager->_palette); _vm->_graphicsManager->lockScreen(); - _vm->_graphicsManager->m_scroll16(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + _vm->_graphicsManager->copy16BitRect(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); _vm->_graphicsManager->unlockScreen(); _vm->_graphicsManager->addRefreshRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); @@ -355,13 +355,13 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u _vm->_graphicsManager->setScreenWidth(2 * SCREEN_WIDTH); _vm->_graphicsManager->_maxX = 2 * SCREEN_WIDTH; _vm->_graphicsManager->lockScreen(); - _vm->_graphicsManager->m_scroll16(_vm->_graphicsManager->_frontBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + _vm->_graphicsManager->copy16BitRect(_vm->_graphicsManager->_frontBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); } else { _vm->_graphicsManager->setScreenWidth(SCREEN_WIDTH); _vm->_graphicsManager->_maxX = SCREEN_WIDTH; _vm->_graphicsManager->lockScreen(); _vm->_graphicsManager->clearScreen(); - _vm->_graphicsManager->m_scroll16(_vm->_graphicsManager->_frontBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + _vm->_graphicsManager->copy16BitRect(_vm->_graphicsManager->_frontBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); } _vm->_graphicsManager->unlockScreen(); _vm->_graphicsManager->addRefreshRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); @@ -598,7 +598,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui _vm->_graphicsManager->setPaletteVGA256(_vm->_graphicsManager->_palette); } else { _vm->_graphicsManager->lockScreen(); - _vm->_graphicsManager->m_scroll16(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + _vm->_graphicsManager->copy16BitRect(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); _vm->_graphicsManager->unlockScreen(); _vm->_graphicsManager->addRefreshRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); @@ -721,7 +721,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u } else { _vm->_graphicsManager->lockScreen(); _vm->_graphicsManager->setPaletteVGA256(_vm->_graphicsManager->_palette); - _vm->_graphicsManager->m_scroll16(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + _vm->_graphicsManager->copy16BitRect(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); _vm->_graphicsManager->unlockScreen(); _vm->_graphicsManager->addRefreshRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp index 1dcfb61315..2184bfae30 100644 --- a/engines/hopkins/computer.cpp +++ b/engines/hopkins/computer.cpp @@ -424,13 +424,13 @@ void ComputerManager::displayMessage(int xp, int yp, int textIdx) { _inputBuf[textIndex--] = 0; x1 -= _vm->_fontManager->_fontFixedWidth; x2 = x1 + 2 * _vm->_fontManager->_fontFixedWidth; - _vm->_graphicsManager->Copy_Mem(_vm->_graphicsManager->_backBuffer, x1, yp, 3 * _vm->_fontManager->_fontFixedWidth, 12, _vm->_graphicsManager->_frontBuffer, x1, yp); + _vm->_graphicsManager->copyRect(_vm->_graphicsManager->_backBuffer, x1, yp, 3 * _vm->_fontManager->_fontFixedWidth, 12, _vm->_graphicsManager->_frontBuffer, x1, yp); _vm->_graphicsManager->addDirtyRect(x1, yp, x2, yp + 12); _vm->_fontManager->displayTextVesa(x1, yp, "_", 252); } if (mappedChar != '*') { char newChar = mappedChar; - _vm->_graphicsManager->Copy_Mem(_vm->_graphicsManager->_backBuffer, x1, yp, _vm->_fontManager->_fontFixedWidth, 12, _vm->_graphicsManager->_frontBuffer, x1, yp); + _vm->_graphicsManager->copyRect(_vm->_graphicsManager->_backBuffer, x1, yp, _vm->_fontManager->_fontFixedWidth, 12, _vm->_graphicsManager->_frontBuffer, x1, yp); _vm->_graphicsManager->addDirtyRect(x1, yp, _vm->_fontManager->_fontFixedWidth + x1, yp + 12); _inputBuf[textIndex] = newChar; @@ -442,7 +442,7 @@ void ComputerManager::displayMessage(int xp, int yp, int textIdx) { _vm->_eventsManager->refreshScreenAndEvents(); } while (textIndex != textIdx && curChar != 13); - _vm->_graphicsManager->Copy_Mem(_vm->_graphicsManager->_backBuffer, x1, yp, _vm->_fontManager->_fontFixedWidth, 12, _vm->_graphicsManager->_frontBuffer, x1, yp); + _vm->_graphicsManager->copyRect(_vm->_graphicsManager->_backBuffer, x1, yp, _vm->_fontManager->_fontFixedWidth, 12, _vm->_graphicsManager->_frontBuffer, x1, yp); _vm->_graphicsManager->addDirtyRect(x1, yp, _vm->_fontManager->_fontFixedWidth + x1, yp + 12); _vm->_eventsManager->refreshScreenAndEvents(); diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp index 8652f500e1..b43dba26d8 100644 --- a/engines/hopkins/events.cpp +++ b/engines/hopkins/events.cpp @@ -465,7 +465,7 @@ void EventsManager::refreshScreenAndEvents() { } else { _vm->_fontManager->hideText(9); _vm->_graphicsManager->lockScreen(); - _vm->_graphicsManager->m_scroll16(_vm->_graphicsManager->_frontBuffer, _vm->_graphicsManager->_scrollPosX, 20, SCREEN_WIDTH, 440, 0, 20); + _vm->_graphicsManager->copy16BitRect(_vm->_graphicsManager->_frontBuffer, _vm->_graphicsManager->_scrollPosX, 20, SCREEN_WIDTH, 440, 0, 20); _vm->_graphicsManager->unlockScreen(); _vm->_graphicsManager->resetRefreshRects(); diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp index d8abc5e704..7765c5c579 100644 --- a/engines/hopkins/font.cpp +++ b/engines/hopkins/font.cpp @@ -362,7 +362,7 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in error("Cutting a block for text box (%d)", size); _vm->_graphicsManager->copySurfaceRect(_vm->_graphicsManager->_frontBuffer, ptrd, posX, posY, saveWidth, saveHeight); - _vm->_graphicsManager->Trans_bloc2(ptrd, _vm->_graphicsManager->_colorTable, size); + _vm->_graphicsManager->fillSurface(ptrd, _vm->_graphicsManager->_colorTable, size); _vm->_graphicsManager->restoreSurfaceRect(_vm->_graphicsManager->_frontBuffer, ptrd, posX, posY, saveWidth, saveHeight); _vm->_globals->freeMemory(ptrd); diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 45ae3414b0..c545c983d7 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -224,7 +224,7 @@ void GraphicsManager::loadScreen(const Common::String &file) { _maxX = SCREEN_WIDTH; lockScreen(); clearScreen(); - m_scroll16(_backBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + copy16BitRect(_backBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); unlockScreen(); } else { setScreenWidth(SCREEN_WIDTH * 2); @@ -235,7 +235,7 @@ void GraphicsManager::loadScreen(const Common::String &file) { if (MANU_SCROLL) { lockScreen(); - m_scroll16(_backBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + copy16BitRect(_backBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); unlockScreen(); } } @@ -247,7 +247,7 @@ void GraphicsManager::initColorTable(int minIndex, int maxIndex, byte *palette) for (int idx = 0; idx < 256; ++idx) _colorTable[idx] = idx; - Trans_bloc(_colorTable, palette, 256, minIndex, maxIndex); + translateSurface(_colorTable, palette, 256, minIndex, maxIndex); for (int idx = 0; idx < 256; ++idx) { byte v = _colorTable[idx]; @@ -268,7 +268,7 @@ void GraphicsManager::scrollScreen(int amount) { _scrollPosX = result; } -void GraphicsManager::Trans_bloc(byte *destP, const byte *srcP, int count, int minThreshold, int maxThreshold) { +void GraphicsManager::translateSurface(byte *destP, const byte *srcP, int count, int minThreshold, int maxThreshold) { byte *destPosP = destP; for (int idx = 0; idx < count; ++idx) { int palIndex = *destPosP; @@ -294,7 +294,7 @@ void GraphicsManager::Trans_bloc(byte *destP, const byte *srcP, int count, int m } } -void GraphicsManager::Trans_bloc2(byte *surface, byte *col, int size) { +void GraphicsManager::fillSurface(byte *surface, byte *col, int size) { byte dataVal; byte *dataP = surface; @@ -417,7 +417,7 @@ void GraphicsManager::setScreenWidth(int pitch) { /** * Copies data from a 8-bit palette surface into the 16-bit screen */ -void GraphicsManager::m_scroll16(const byte *surface, int xs, int ys, int width, int height, int destX, int destY) { +void GraphicsManager::copy16BitRect(const byte *surface, int xs, int ys, int width, int height, int destX, int destY) { lockScreen(); assert(_videoPtr); @@ -444,7 +444,7 @@ void GraphicsManager::m_scroll16(const byte *surface, int xs, int ys, int width, addRefreshRect(destX, destY, destX + width, destY + height); } -void GraphicsManager::copyTo16Bit(const byte *surface, int xp, int yp, int width, int height, int destX, int destY) { +void GraphicsManager::copy8BitRect(const byte *surface, int xp, int yp, int width, int height, int destX, int destY) { int xCtr; const byte *palette; int savedXCount; @@ -509,7 +509,7 @@ void GraphicsManager::fadeIn(const byte *palette, int step, const byte *surface) // Set the transition palette and refresh the screen setPaletteVGA256(palData2); - m_scroll16(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + copy16BitRect(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); updateScreen(); // Added a delay in order to see the fading @@ -520,7 +520,7 @@ void GraphicsManager::fadeIn(const byte *palette, int step, const byte *surface) setPaletteVGA256(palette); // Refresh the screen - m_scroll16(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + copy16BitRect(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); updateScreen(); } @@ -539,7 +539,7 @@ void GraphicsManager::fadeOut(const byte *palette, int step, const byte *surface } setPaletteVGA256(palData); - m_scroll16(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + copy16BitRect(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); updateScreen(); _vm->_eventsManager->delay(20); @@ -551,7 +551,7 @@ void GraphicsManager::fadeOut(const byte *palette, int step, const byte *surface palData[i] = 0; setPaletteVGA256(palData); - m_scroll16(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + copy16BitRect(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); updateScreen(); } @@ -636,7 +636,7 @@ void GraphicsManager::setPaletteVGA256(const byte *palette) { void GraphicsManager::setPaletteVGA256WithRefresh(const byte *palette, const byte *surface) { changePalette(palette); - m_scroll16(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + copy16BitRect(surface, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); updateScreen(); } @@ -1115,7 +1115,7 @@ void GraphicsManager::displayDirtyRects() { Common::Rect dstRect; if (_vm->_eventsManager->_breakoutFl) { - copyTo16Bit(_frontBuffer, r.left, r.top, r.right - r.left, r.bottom - r.top, r.left, r.top); + copy8BitRect(_frontBuffer, r.left, r.top, r.right - r.left, r.bottom - r.top, r.left, r.top); dstRect.left = r.left * 2; dstRect.top = r.top * 2 + 30; dstRect.setWidth((r.right - r.left) * 2); @@ -1126,7 +1126,7 @@ void GraphicsManager::displayDirtyRects() { // WORKAROUND: Original didn't lock the screen for access lockScreen(); - m_scroll16(_frontBuffer, r.left, r.top, r.right - r.left, r.bottom - r.top, r.left - _vm->_eventsManager->_startPos.x, r.top); + copy16BitRect(_frontBuffer, r.left, r.top, r.right - r.left, r.bottom - r.top, r.left - _vm->_eventsManager->_startPos.x, r.top); dstRect.left = r.left - _vm->_eventsManager->_startPos.x; dstRect.top = r.top; @@ -1622,12 +1622,12 @@ void GraphicsManager::copySurface(const byte *surface, int x1, int y1, int width if (croppedWidth > 0 && croppedHeight > 0) { int height2 = croppedHeight; - Copy_Mem(surface, left, top, croppedWidth, croppedHeight, destSurface, destX, destY); + copyRect(surface, left, top, croppedWidth, croppedHeight, destSurface, destX, destY); addDirtyRect(left, top, left + croppedWidth, top + height2); } } -void GraphicsManager::Copy_Mem(const byte *srcSurface, int x1, int y1, uint16 width, int height, byte *destSurface, int destX, int destY) { +void GraphicsManager::copyRect(const byte *srcSurface, int x1, int y1, uint16 width, int height, byte *destSurface, int destX, int destY) { const byte *srcP = x1 + _lineNbr2 * y1 + srcSurface; byte *destP = destX + _lineNbr2 * destY + destSurface; int yp = height; @@ -1741,17 +1741,17 @@ void GraphicsManager::initScreen(const Common::String &file, int mode, bool init _vm->_objectsManager->_changeVerbFl = false; } -void GraphicsManager::NB_SCREEN(bool initPalette) { +void GraphicsManager::displayScreen(bool initPalette) { if (initPalette) initColorTable(50, 65, _palette); if (_lineNbr == SCREEN_WIDTH) - Trans_bloc2(_frontBuffer, _colorTable, SCREEN_WIDTH * SCREEN_HEIGHT); + fillSurface(_frontBuffer, _colorTable, SCREEN_WIDTH * SCREEN_HEIGHT); else if (_lineNbr == (SCREEN_WIDTH * 2)) - Trans_bloc2(_frontBuffer, _colorTable, SCREEN_WIDTH * SCREEN_HEIGHT * 2); + fillSurface(_frontBuffer, _colorTable, SCREEN_WIDTH * SCREEN_HEIGHT * 2); lockScreen(); - m_scroll16(_frontBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + copy16BitRect(_frontBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); unlockScreen(); memcpy(_backBuffer, _frontBuffer, 614399); diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h index fd4391bf10..23b7d4338f 100644 --- a/engines/hopkins/graphics.h +++ b/engines/hopkins/graphics.h @@ -81,8 +81,8 @@ private: uint16 mapRGB(byte r, byte g, byte b); void copy16bFromSurfaceScaleX2(const byte *surface); - void Trans_bloc(byte *destP, const byte *srcP, int count, int minThreshold, int maxThreshold); - void copyTo16Bit(const byte *surface, int xp, int yp, int width, int height, int destX, int destY); + void translateSurface(byte *destP, const byte *srcP, int count, int minThreshold, int maxThreshold); + void copy8BitRect(const byte *surface, int xp, int yp, int width, int height, int destX, int destY); public: byte _colorTable[PALETTE_EXT_BLOCK_SIZE]; byte _palette[PALETTE_EXT_BLOCK_SIZE]; @@ -145,7 +145,6 @@ public: void fadeOutBreakout(); void fadeOutLong(); void fadeOutShort(); - void fastDisplay(const byte *spriteData, int xp, int yp, int spriteIndex, bool addSegment = true); void copyWinscanVbe3(const byte *srcData, byte *destSurface); void copyWinscanVbe(const byte *srcP, byte *destP); void copyVideoVbe16(const byte *srcData); @@ -171,13 +170,14 @@ public: void setColorPercentage(int palIndex, int r, int g, int b); void setColorPercentage2(int palIndex, int r, int g, int b); + void fastDisplay(const byte *spriteData, int xp, int yp, int spriteIndex, bool addSegment = true); void fastDisplay2(const byte *objectData, int xp, int yp, int idx, bool addSegment = true); void drawCompressedSprite(byte *surface, const byte *srcData, int xp300, int yp300, int frameIndex, int zoom1, int zoom2, bool flipFl); - void Copy_Mem(const byte *srcSurface, int x1, int y1, uint16 width, int height, byte *destSurface, int destX, int destY); + void copyRect(const byte *srcSurface, int x1, int y1, uint16 width, int height, byte *destSurface, int destX, int destY); void drawVesaSprite(byte *surface, const byte *spriteData, int xp, int yp, int spriteIndex); - void m_scroll16(const byte *surface, int xs, int ys, int width, int height, int destX, int destY); - void Trans_bloc2(byte *surface, byte *col, int size); - void NB_SCREEN(bool initPalette); + void copy16BitRect(const byte *surface, int xs, int ys, int width, int height, int destX, int destY); + void fillSurface(byte *surface, byte *col, int size); + void displayScreen(bool initPalette); void backupScreen(); void restoreScreen(); }; diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index 18b6398b44..100c7f81bd 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -2658,13 +2658,13 @@ void ObjectsManager::handleSpecialGames() { if (!_vm->_graphicsManager->_lineNbr) _vm->_graphicsManager->_scrollOffset = 0; - _vm->_graphicsManager->NB_SCREEN(true); + _vm->_graphicsManager->displayScreen(true); _vm->_soundManager->_specialSoundNum = 198; _charactersEnabledFl = true; _vm->_animationManager->unsetClearAnimFlag(); _vm->_animationManager->playAnim("otage.ANM", 1, 24, 500, true); _vm->_soundManager->_specialSoundNum = 0; - _vm->_graphicsManager->NB_SCREEN(false); + _vm->_graphicsManager->displayScreen(false); _vm->_graphicsManager->restoreScreen(); @@ -2673,7 +2673,7 @@ void ObjectsManager::handleSpecialGames() { _vm->_graphicsManager->setPaletteVGA256(_vm->_graphicsManager->_palette); _vm->_globals->freeMemory(oldPalette); _vm->_graphicsManager->lockScreen(); - _vm->_graphicsManager->m_scroll16(_vm->_graphicsManager->_backBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + _vm->_graphicsManager->copy16BitRect(_vm->_graphicsManager->_backBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); _vm->_graphicsManager->unlockScreen(); memcpy(_vm->_graphicsManager->_frontBuffer, _vm->_graphicsManager->_backBuffer, 614399); diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index 4dbe23eeb6..04f22498b0 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -2314,7 +2314,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_objectsManager->removeSprite(0); _vm->_objectsManager->setAndPlayAnim(6, 0, 15, false); _vm->_objectsManager->_charactersEnabledFl = true; - _vm->_graphicsManager->NB_SCREEN(true); + _vm->_graphicsManager->displayScreen(true); _vm->_animationManager->playSequence2("TUNNEL.SEQ", 1, 18, 20, true); _vm->_graphicsManager->_noFadingFl = true; _vm->_graphicsManager->fadeOutLong(); diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp index 49b0ae27b7..d6d86070e1 100644 --- a/engines/hopkins/talk.cpp +++ b/engines/hopkins/talk.cpp @@ -89,7 +89,7 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename) if (!_vm->_graphicsManager->_lineNbr) _vm->_graphicsManager->_scrollOffset = 0; - _vm->_graphicsManager->NB_SCREEN(true); + _vm->_graphicsManager->displayScreen(true); _vm->_objectsManager->_charactersEnabledFl = true; searchCharacterPalette(_paletteBufferIdx, false); startCharacterAnim0(_paletteBufferIdx, false); @@ -123,7 +123,7 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename) _vm->_globals->_introSpeechOffFl = false; _characterBuffer = _vm->_globals->freeMemory(_characterBuffer); _characterSprite = _vm->_globals->freeMemory(_characterSprite); - _vm->_graphicsManager->NB_SCREEN(false); + _vm->_graphicsManager->displayScreen(false); _vm->_graphicsManager->restoreScreen(); @@ -139,7 +139,7 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename) _vm->_graphicsManager->initColorTable(145, 150, _vm->_graphicsManager->_palette); _vm->_graphicsManager->setPaletteVGA256(_vm->_graphicsManager->_palette); _vm->_graphicsManager->lockScreen(); - _vm->_graphicsManager->m_scroll16(_vm->_graphicsManager->_backBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + _vm->_graphicsManager->copy16BitRect(_vm->_graphicsManager->_backBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); _vm->_graphicsManager->unlockScreen(); memcpy(_vm->_graphicsManager->_frontBuffer, _vm->_graphicsManager->_backBuffer, 614399); _vm->_globals->_disableInventFl = oldDisableInventFl; @@ -1002,9 +1002,9 @@ void TalkManager::animateObject(const Common::String &filename) { if (!_vm->_graphicsManager->_lineNbr) _vm->_graphicsManager->_scrollOffset = 0; - _vm->_graphicsManager->NB_SCREEN(true); + _vm->_graphicsManager->displayScreen(true); _paletteBufferIdx = 20 * READ_LE_INT16((uint16 *)_characterBuffer + 42) + 110; - _vm->_graphicsManager->NB_SCREEN(true); + _vm->_graphicsManager->displayScreen(true); _vm->_objectsManager->_charactersEnabledFl = true; searchCharacterPalette(_paletteBufferIdx, true); startCharacterAnim0(_paletteBufferIdx, false); @@ -1041,7 +1041,7 @@ void TalkManager::animateObject(const Common::String &filename) { _vm->_globals->_introSpeechOffFl = false; _characterBuffer = _vm->_globals->freeMemory(_characterBuffer); _characterSprite = _vm->_globals->freeMemory(_characterSprite); - _vm->_graphicsManager->NB_SCREEN(false); + _vm->_graphicsManager->displayScreen(false); _vm->_linesManager->clearAllZones(); _vm->_linesManager->resetLines(); _vm->_objectsManager->resetHidingItems(); @@ -1071,7 +1071,7 @@ void TalkManager::animateObject(const Common::String &filename) { _vm->_graphicsManager->initColorTable(145, 150, _vm->_graphicsManager->_palette); _vm->_graphicsManager->setPaletteVGA256(_vm->_graphicsManager->_palette); _vm->_graphicsManager->lockScreen(); - _vm->_graphicsManager->m_scroll16(_vm->_graphicsManager->_backBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); + _vm->_graphicsManager->copy16BitRect(_vm->_graphicsManager->_backBuffer, _vm->_eventsManager->_startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); _vm->_graphicsManager->unlockScreen(); _vm->_graphicsManager->setPaletteVGA256(_vm->_graphicsManager->_palette); memcpy(_vm->_graphicsManager->_frontBuffer, _vm->_graphicsManager->_backBuffer, 614399); -- cgit v1.2.3