diff options
| author | Paul Gilbert | 2016-03-19 23:02:41 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-03-19 23:02:41 -0400 |
| commit | 8b5ad45f4a2881d5f72b03855c2d8c1c0f63d70d (patch) | |
| tree | 5c243a6b02ebd36608cc652892e55da1637dd08f /engines | |
| parent | c6b239bdac7c193bc4d0fe8cfc6fbb610d1ca1ca (diff) | |
| download | scummvm-rg350-8b5ad45f4a2881d5f72b03855c2d8c1c0f63d70d.tar.gz scummvm-rg350-8b5ad45f4a2881d5f72b03855c2d8c1c0f63d70d.tar.bz2 scummvm-rg350-8b5ad45f4a2881d5f72b03855c2d8c1c0f63d70d.zip | |
TITANIC: Minor fixes executing game manager update
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/core/view_item.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game_manager.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game_manager.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp index a80f25bcc1..c48166698d 100644 --- a/engines/titanic/core/view_item.cpp +++ b/engines/titanic/core/view_item.cpp @@ -31,7 +31,7 @@ namespace Titanic { CViewItem::CViewItem() : CNamedItem() { - Common::fill(&_buttonUpTargets[0], &_buttonUpTargets[3], nullptr); + Common::fill(&_buttonUpTargets[0], &_buttonUpTargets[4], nullptr); _field24 = 0; _field28 = 0.0; _viewNumber = 0; diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp index 1c480e5d4d..675323198e 100644 --- a/engines/titanic/game_manager.cpp +++ b/engines/titanic/game_manager.cpp @@ -175,7 +175,7 @@ void CGameManager::update() { // And the text cursor CScreenManager *screenManager = CScreenManager::_screenManagerPtr; CTextCursor *textCursor = screenManager->_textCursor; - if (textCursor->_active) + if (textCursor && textCursor->_active) _bounds.extend(textCursor->getBounds()); // Set the surface bounds diff --git a/engines/titanic/game_manager.h b/engines/titanic/game_manager.h index f63b571ded..f18696bf5c 100644 --- a/engines/titanic/game_manager.h +++ b/engines/titanic/game_manager.h @@ -178,7 +178,7 @@ public: void playClip(CMovieClip *clip, CRoomItem *oldRoom, CRoomItem *newRoom); /** - * Updates the state of the manager + * Main frame update method for the game */ void update(); |