diff options
author | Paul Gilbert | 2017-01-21 21:16:39 -0500 |
---|---|---|
committer | Paul Gilbert | 2017-01-21 21:16:39 -0500 |
commit | 7c2265659aa69aed7aceecc76d660bef3d830b99 (patch) | |
tree | 132eea44dce16176f2bf941d0c96ab26f1a27997 /engines/titanic/core | |
parent | ddc08c8fa25245445910c386cdb2bca38314a756 (diff) | |
download | scummvm-rg350-7c2265659aa69aed7aceecc76d660bef3d830b99.tar.gz scummvm-rg350-7c2265659aa69aed7aceecc76d660bef3d830b99.tar.bz2 scummvm-rg350-7c2265659aa69aed7aceecc76d660bef3d830b99.zip |
TITANIC: Fix display of busy cursor across entire TV throw cutscene
Diffstat (limited to 'engines/titanic/core')
-rw-r--r-- | engines/titanic/core/game_object.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index bcdf77b675..beee255c2d 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1151,7 +1151,15 @@ void CGameObject::lockMouse() { gameMan->lockInputHandler(); if (CScreenManager::_screenManagerPtr->_mouseCursor) - CScreenManager::_screenManagerPtr->_mouseCursor->hide(); + CScreenManager::_screenManagerPtr->_mouseCursor->incBusyCount(); +} + +void CGameObject::unlockMouse() { + if (CScreenManager::_screenManagerPtr->_mouseCursor) + CScreenManager::_screenManagerPtr->_mouseCursor->decBusyCount(); + + CGameManager *gameMan = getGameManager(); + gameMan->unlockInputHandler(); } void CGameObject::hideMouse() { @@ -1192,14 +1200,6 @@ void CGameObject::unlockInputHandler() { getGameManager()->unlockInputHandler(); } -void CGameObject::unlockMouse() { - if (CScreenManager::_screenManagerPtr->_mouseCursor) - CScreenManager::_screenManagerPtr->_mouseCursor->show(); - - CGameManager *gameMan = getGameManager(); - gameMan->unlockInputHandler(); -} - void CGameObject::loadSurface() { if (!_surface && !_resource.empty()) { loadResource(_resource); |