diff options
| author | Strangerke | 2013-04-10 12:25:36 +0200 |
|---|---|---|
| committer | Strangerke | 2013-04-10 12:25:36 +0200 |
| commit | 1ac0c06bf61818bc37e96c9dd1a82f027f313ca5 (patch) | |
| tree | 1ef12709a344ab2986eb912196ddd877de8ddcc2 /engines/hopkins/graphics.cpp | |
| parent | 5ae15d1e108a22736637664112c38bfaa1018316 (diff) | |
| download | scummvm-rg350-1ac0c06bf61818bc37e96c9dd1a82f027f313ca5.tar.gz scummvm-rg350-1ac0c06bf61818bc37e96c9dd1a82f027f313ca5.tar.bz2 scummvm-rg350-1ac0c06bf61818bc37e96c9dd1a82f027f313ca5.zip | |
HOPKINS: Reduce the use of lockScreen() and unlockScreen() by adding them in clearScreen()
Diffstat (limited to 'engines/hopkins/graphics.cpp')
| -rw-r--r-- | engines/hopkins/graphics.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 49ff2df189..5637cd7d77 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -151,10 +151,12 @@ void GraphicsManager::unlockScreen() { * Clear Screen */ void GraphicsManager::clearScreen() { + lockScreen(); assert(_videoPtr); Common::fill(_screenBuffer, _screenBuffer + _screenLineSize * _screenHeight, 0); addRefreshRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + unlockScreen(); } void GraphicsManager::clearVesaScreen() { @@ -177,9 +179,7 @@ void GraphicsManager::loadImage(const Common::String &file) { */ void GraphicsManager::loadVgaImage(const Common::String &file) { setScreenWidth(SCREEN_WIDTH); - lockScreen(); clearScreen(); - unlockScreen(); loadPCX320(_backBuffer, file, _palette); memcpy(_frontBuffer, _backBuffer, 64000); setScreenWidth(320); @@ -222,16 +222,14 @@ void GraphicsManager::loadScreen(const Common::String &file) { if (!_largeScreenFl) { setScreenWidth(SCREEN_WIDTH); _maxX = SCREEN_WIDTH; - lockScreen(); clearScreen(); + lockScreen(); copy16BitRect(_backBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); unlockScreen(); } else { setScreenWidth(SCREEN_WIDTH * 2); _maxX = SCREEN_WIDTH * 2; - lockScreen(); clearScreen(); - unlockScreen(); if (MANU_SCROLL) { lockScreen(); |