diff options
| author | vanfanel | 2015-11-11 17:56:12 +0100 |
|---|---|---|
| committer | vanfanel | 2015-11-11 17:56:12 +0100 |
| commit | 99739a13fe844c807d3cdd87e67e207e888fd48a (patch) | |
| tree | 6afbf4763326277efbf528f0bb9e587bf7a01788 /engines/voyeur | |
| parent | 37e157a11c3fc731dfdcf6ec6b6a5a448550219b (diff) | |
| parent | 7e44493fe8877a3c6a65f83b9ed84a5f59169005 (diff) | |
| download | scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.tar.gz scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.tar.bz2 scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.zip | |
Merge branch 'master' into dispmanx
Diffstat (limited to 'engines/voyeur')
| -rw-r--r-- | engines/voyeur/events.cpp | 4 | ||||
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index 7ce7351e65..34ef507ad3 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -76,7 +76,7 @@ EventsManager::EventsManager(VoyeurEngine *vm) : _intPtr(_gameData), _leftClick = _rightClick = false; _mouseClicked = _newMouseClicked = false; - _newLeftClick = _newRightClick = false;; + _newLeftClick = _newRightClick = false; _videoDead = 0; @@ -403,7 +403,7 @@ void EventsManager::vDoCycleInt() { int palIndex = READ_LE_UINT16(pSrc); pPal[palIndex * 3] = pSrc[3]; pPal[palIndex * 3 + 1] = pSrc[4]; - pPal[palIndex * 3 + 1] = pSrc[5]; + pPal[palIndex * 3 + 2] = pSrc[5]; pSrc += 6; if ((int16)READ_LE_UINT16(pSrc) >= 0) { diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index 0615c67ba0..53eb5ce3c5 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -1082,6 +1082,7 @@ int ThreadResource::doApt() { break; case 2: _vm->_voy->_aptLoadMode = 142; + break; case 5: _vm->_voy->_aptLoadMode = 141; break; |