diff options
| -rw-r--r-- | engines/hopkins/events.cpp | 35 | ||||
| -rw-r--r-- | engines/hopkins/graphics.cpp | 1 | ||||
| -rw-r--r-- | engines/hopkins/graphics.h | 1 |
3 files changed, 11 insertions, 26 deletions
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp index e76d71d62b..cac6b83a20 100644 --- a/engines/hopkins/events.cpp +++ b/engines/hopkins/events.cpp @@ -150,18 +150,19 @@ void EventsManager::mouseOn() { void EventsManager::changeMouseCursor(int id) { int cursorId = id; - if (_mouseCursorId != 23) { - if (id == 4 && _mouseCursorId == 4 && _vm->_globals.NOMARCHE) - cursorId = 0; - if (cursorId == 25) - cursorId = 5; + if (_mouseCursorId == 23) + return; - if (_oldIconId != cursorId || !cursorId) { - _oldIconId = cursorId; - _mouseSpriteId = cursorId; + if (id == 4 && _mouseCursorId == 4 && _vm->_globals.NOMARCHE) + cursorId = 0; + if (cursorId == 25) + cursorId = 5; - updateCursor(); - } + if (_oldIconId != cursorId || !cursorId) { + _oldIconId = cursorId; + _mouseSpriteId = cursorId; + + updateCursor(); } } @@ -322,20 +323,6 @@ void EventsManager::VBL() { int v15 = 0; int yp = 0; - if (_vm->_graphicsManager.REDRAW) { - _vm->_graphicsManager.lockScreen(); - if (_breakoutFl) { - _vm->_graphicsManager.CopyAsm(_vm->_graphicsManager._vesaBuffer); - _vm->_graphicsManager.REDRAW = 0; - } else { - if (_vm->_globals.iRegul == 3) - _vm->_graphicsManager.m_scroll(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager.ofscroll, 50, 640, 340, 0, 50); - else - _vm->_graphicsManager.m_scroll(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager.ofscroll, 20, 640, 440, 0, 20); - --_vm->_graphicsManager.REDRAW; - } - _vm->_graphicsManager.unlockScreen(); - } if (_mouseFl) { v1 = 20; if (!_mouseLinuxFl) diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index abe2abe85b..8264b6ba70 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -54,7 +54,6 @@ GraphicsManager::GraphicsManager() { FADE_LINUX = 0; _skipVideoLockFl = false; no_scroll = 0; - REDRAW = false; min_x = 0; min_y = 20; max_x = SCREEN_WIDTH * 2; diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h index e239344b46..40bbd67cb5 100644 --- a/engines/hopkins/graphics.h +++ b/engines/hopkins/graphics.h @@ -83,7 +83,6 @@ public: bool _skipVideoLockFl; int no_scroll; Common::Rect dstrect[50]; - int REDRAW; int min_x, min_y; int max_x, max_y; int clip_x, clip_y; |