diff options
Diffstat (limited to 'engines/hopkins')
-rw-r--r-- | engines/hopkins/computer.cpp | 14 | ||||
-rw-r--r-- | engines/hopkins/events.cpp | 6 | ||||
-rw-r--r-- | engines/hopkins/graphics.cpp | 6 | ||||
-rw-r--r-- | engines/hopkins/graphics.h | 4 | ||||
-rw-r--r-- | engines/hopkins/hopkins.cpp | 8 | ||||
-rw-r--r-- | engines/hopkins/objects.cpp | 2 | ||||
-rw-r--r-- | engines/hopkins/script.cpp | 2 |
7 files changed, 21 insertions, 21 deletions
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp index 37f1dd2ec7..b1f71cdcd3 100644 --- a/engines/hopkins/computer.cpp +++ b/engines/hopkins/computer.cpp @@ -127,7 +127,7 @@ void ComputerManager::setTextPosition(int yp, int xp) { */ void ComputerManager::showComputer(ComputerEnum mode) { _vm->_eventsManager._escKeyFl = false; - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); setVideoMode(); setTextColor(4); setTextPosition(2, 4); @@ -287,7 +287,7 @@ void ComputerManager::showComputer(ComputerEnum mode) { else // Free access or Samantha _vm->_globals._exitId = 14; - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); } static const char _englishText[] = @@ -557,9 +557,9 @@ void ComputerManager::displayGamesSubMenu() { loadHiscore(); setModeVGA256(); newLevel(); - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); playBreakout(); - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); _breakoutSpr = _vm->_globals.freeMemory(_breakoutSpr); _breakoutLevel = (int16 *)_vm->_globals.freeMemory((byte *)_breakoutLevel); _vm->_objectsManager._sprite[0]._spriteData = oldSpriteData; @@ -726,7 +726,7 @@ void ComputerManager::playBreakout() { _ballPosition = Common::Point(_padPositionX + 14, 187); _vm->_objectsManager.setSpriteY(1, 187); _vm->_objectsManager.setSpriteX(1, _ballPosition.x); - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); _vm->_eventsManager.VBL(); _vm->_graphicsManager.fadeInBreakout(); @@ -801,7 +801,7 @@ void ComputerManager::playBreakout() { * @return The selected button index: 1 = Game, 2 = Quit */ int ComputerManager::displayHiscores() { - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); loadHiscore(); _vm->_graphicsManager.loadVgaImage("HISCORE.PCX"); byte *ptr = _vm->_fileManager.loadFile("ALPHA.SPR"); @@ -827,7 +827,7 @@ int ComputerManager::displayHiscores() { } _vm->_graphicsManager.fadeInBreakout(); - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); int buttonIndex = 0; do { _vm->_eventsManager.refreshEvents(); diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp index 519bd64c2a..b64f0cd6fb 100644 --- a/engines/hopkins/events.cpp +++ b/engines/hopkins/events.cpp @@ -446,7 +446,7 @@ void EventsManager::VBL() { _vm->_globals._speed = 2; _rateCounter = 0; if (!_vm->_graphicsManager._largeScreenFl || _vm->_graphicsManager._scrollStatus == 1) { - _vm->_graphicsManager.displayVesaSegment(); + _vm->_graphicsManager.displayDirtyRects(); } else { if (_vm->_graphicsManager._scrollStatus != 2) { if (getMouseX() > _vm->_graphicsManager._scrollPosX + 620) @@ -459,7 +459,7 @@ void EventsManager::VBL() { if (_vm->_graphicsManager._scrollPosX > SCREEN_WIDTH) _vm->_graphicsManager._scrollPosX = SCREEN_WIDTH; if (_vm->_graphicsManager._oldScrollPosX == _vm->_graphicsManager._scrollPosX) { - _vm->_graphicsManager.displayVesaSegment(); + _vm->_graphicsManager.displayDirtyRects(); } else { _vm->_fontManager.hideText(9); _vm->_graphicsManager.lockScreen(); @@ -469,7 +469,7 @@ void EventsManager::VBL() { _vm->_graphicsManager.resetRefreshRects(); _vm->_graphicsManager.addRefreshRect(Common::Rect(0, 20, SCREEN_WIDTH, 460)); - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); _startPos.x = _vm->_graphicsManager._scrollPosX; _vm->_graphicsManager._scrollOffset = _vm->_graphicsManager._scrollPosX; diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 4fe9c4ef39..75280c48d7 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -1092,7 +1092,7 @@ void GraphicsManager::displayAllBob() { } } -void GraphicsManager::resetVesaSegment() { +void GraphicsManager::resetDirtyRects() { _dirtyRects.clear(); } @@ -1135,7 +1135,7 @@ void GraphicsManager::addRefreshRect(const Common::Rect &r) { } // Draw any game dirty rects onto the screen intermediate surface -void GraphicsManager::displayVesaSegment() { +void GraphicsManager::displayDirtyRects() { if (_dirtyRects.size() == 0) return; @@ -1175,7 +1175,7 @@ void GraphicsManager::displayVesaSegment() { } unlockScreen(); - resetVesaSegment(); + resetDirtyRects(); } void GraphicsManager::displayRefreshRects() { diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h index 367b0a2755..bdd8fee578 100644 --- a/engines/hopkins/graphics.h +++ b/engines/hopkins/graphics.h @@ -124,11 +124,11 @@ public: void unlockScreen(); void clearPalette(); void clearScreen(); - void resetVesaSegment(); + void resetDirtyRects(); void resetRefreshRects(); void addDirtyRect(int x1, int y1, int x2, int y2); void addRefreshRect(const Common::Rect &r); - void displayVesaSegment(); + void displayDirtyRects(); void displayRefreshRects(); void copySurface(const byte *surface, int x1, int y1, int width, int height, byte *destSurface, int destX, int destY); void loadImage(const Common::String &file); diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index 3d4d152229..5e55c281cc 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -343,7 +343,7 @@ bool HopkinsEngine::runWin95Demo() { memset(_graphicsManager._vesaBuffer, 0, 307200); memset(_graphicsManager._vesaScreen, 0, 307200); _graphicsManager.clearPalette(); - _graphicsManager.resetVesaSegment(); + _graphicsManager.resetDirtyRects(); break; case 114: @@ -661,7 +661,7 @@ bool HopkinsEngine::runLinuxDemo() { memset(_graphicsManager._vesaBuffer, 0, 307200); memset(_graphicsManager._vesaScreen, 0, 307200); _graphicsManager.clearPalette(); - _graphicsManager.resetVesaSegment(); + _graphicsManager.resetDirtyRects(); break; case 114: @@ -1434,7 +1434,7 @@ bool HopkinsEngine::runFull() { memset(_graphicsManager._vesaBuffer, 0, 307200); memset(_graphicsManager._vesaScreen, 0, 307200); _graphicsManager.clearPalette(); - _graphicsManager.resetVesaSegment(); + _graphicsManager.resetDirtyRects(); break; case 114: @@ -1905,7 +1905,7 @@ void HopkinsEngine::restoreSystem() { void HopkinsEngine::endLinuxDemo() { _globals._linuxEndDemoFl = true; - _graphicsManager.resetVesaSegment(); + _graphicsManager.resetDirtyRects(); _objectsManager._forestFl = false; _eventsManager._breakoutFl = false; _globals._disableInventFl = true; diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index 20d14af54d..26c0d1c2a8 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -2082,7 +2082,7 @@ void ObjectsManager::clearScreen() { _changeVerbFl = false; _vm->_linesManager._route = (RouteItem *)g_PTRNUL; _vm->_globals._oldDirection = DIR_NONE; - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); } /** diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index 55cbe00930..c9413c15a7 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -2337,7 +2337,7 @@ int ScriptManager::handleOpcode(byte *dataP) { memcpy(_vm->_graphicsManager._oldPalette, _vm->_graphicsManager._palette, 769); _vm->_animationManager.playAnim2("PLAN.ANM", 50, 10, 800); } - _vm->_graphicsManager.resetVesaSegment(); + _vm->_graphicsManager.resetDirtyRects(); break; case 608: |