diff options
| author | Paul Gilbert | 2016-07-23 17:21:38 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-23 17:21:38 -0400 |
| commit | d979dcd020d65aa0019d7a53c1dcd8b4f4a0f909 (patch) | |
| tree | b4dea5cd29cfe4f19e96b4ac48750a6caf8e0daa /engines/titanic/support | |
| parent | 00c568e17572ce2ac4e9c97c21c00a734951ae9a (diff) | |
| download | scummvm-rg350-d979dcd020d65aa0019d7a53c1dcd8b4f4a0f909.tar.gz scummvm-rg350-d979dcd020d65aa0019d7a53c1dcd8b4f4a0f909.tar.bz2 scummvm-rg350-d979dcd020d65aa0019d7a53c1dcd8b4f4a0f909.zip | |
TITANIC: Fixes for movie notification, computer game logic cleanup
Diffstat (limited to 'engines/titanic/support')
| -rw-r--r-- | engines/titanic/support/avi_surface.h | 2 | ||||
| -rw-r--r-- | engines/titanic/support/files_manager.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/support/time_event_info.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h index 53e2aae6fc..d21182bca9 100644 --- a/engines/titanic/support/avi_surface.h +++ b/engines/titanic/support/avi_surface.h @@ -34,7 +34,7 @@ class CSoundManager; class CVideoSurface; enum MovieFlag { - MOVIE_REPEAT = 1, MOVIE_STOP_PREVIOUS = 2, MOVIE_NO_OBJECT = 4, + MOVIE_REPEAT = 1, MOVIE_STOP_PREVIOUS = 2, MOVIE_NOTIFY_OBJECT = 4, MOVIE_REVERSE = 8, MOVIE_GAMESTATE = 0x10 }; diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp index 1d2b1d9a8e..04928b96d6 100644 --- a/engines/titanic/support/files_manager.cpp +++ b/engines/titanic/support/files_manager.cpp @@ -109,7 +109,7 @@ void CFilesManager::debug(CScreenManager *screenManager) { void CFilesManager::resetView() { if (_gameManager) { - _gameManager->_gameState.setMode(GSMODE_SELECTED); + _gameManager->_gameState.setMode(GSMODE_INTERACTIVE); _gameManager->initBounds(); } } diff --git a/engines/titanic/support/time_event_info.cpp b/engines/titanic/support/time_event_info.cpp index 041a01ccfb..a1922338d1 100644 --- a/engines/titanic/support/time_event_info.cpp +++ b/engines/titanic/support/time_event_info.cpp @@ -100,7 +100,7 @@ CTimeEventInfo::CTimeEventInfo() : ListItem(), _lockCounter(0), CTimeEventInfo::CTimeEventInfo(uint ticks, uint f14, uint firstDuration, uint duration, CTreeItem *target, int timerVal3, const CString &action) : ListItem(), _lockCounter(0), _field14(f14), _firstDuration(firstDuration), - _duration(duration), _target(target), _field2C(0), _field30(0), + _duration(duration), _target(target), _actionVal(0), _field2C(0), _field30(0), _timerCtr(0), _lastTimerTicks(ticks), _field3C(0), _done(false), _field44(true) { _id = _nextId++; |