diff options
Diffstat (limited to 'engines/titanic/core')
-rw-r--r-- | engines/titanic/core/game_object.cpp | 8 | ||||
-rw-r--r-- | engines/titanic/core/game_object.h | 11 | ||||
-rw-r--r-- | engines/titanic/core/view_item.cpp | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 76a2f2d5c0..3b9b9f1b46 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1066,12 +1066,12 @@ void CGameObject::quitGame() { getGameManager()->_gameState._quitGame = true; } -void CGameObject::inc54() { - getGameManager()->inc54(); +void CGameObject::incTransitions() { + getGameManager()->incTransitions(); } -void CGameObject::dec54() { - getGameManager()->dec54(); +void CGameObject::decTransitions() { + getGameManager()->decTransitions(); } void CGameObject::setMovieFrameRate(double rate) { diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index ae35e2ba5b..237450ee2f 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -132,8 +132,15 @@ protected: */ void loadImage(const CString &name, bool pendingFlag = true); - void inc54(); - void dec54(); + /** + * Increments the number of active transitions + */ + void incTransitions(); + + /** + * Decrements the number of active transitions + */ + void decTransitions(); /** * Locks/hides the mouse diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp index aa1ff7108e..c25461f5cc 100644 --- a/engines/titanic/core/view_item.cpp +++ b/engines/titanic/core/view_item.cpp @@ -181,7 +181,7 @@ bool CViewItem::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { if (msg->_buttons & MB_LEFT) { if (!handleMouseMsg(msg, true)) { CGameManager *gm = getGameManager(); - if (gm->test54()) { + if (gm->isntTransitioning()) { findNode()->findRoom(); CLinkItem *linkItem = dynamic_cast<CLinkItem *>( |