diff options
| author | Paul Gilbert | 2013-06-17 22:59:26 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-06-17 22:59:26 -0400 |
| commit | b135ce3d28c0558433807fab73bd06514a1ec62f (patch) | |
| tree | db68b373514bbd3585d84b4f5c1d2593d5120894 | |
| parent | 1a2f6fe6f36a30d9dc6e6c4dcf48b448983a31b3 (diff) | |
| download | scummvm-rg350-b135ce3d28c0558433807fab73bd06514a1ec62f.tar.gz scummvm-rg350-b135ce3d28c0558433807fab73bd06514a1ec62f.tar.bz2 scummvm-rg350-b135ce3d28c0558433807fab73bd06514a1ec62f.zip | |
VOYEUR: Further fading memory access bugfixes
| -rw-r--r-- | engines/voyeur/events.cpp | 2 | ||||
| -rw-r--r-- | engines/voyeur/files.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index 22b70b435c..7f8f55f9aa 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -252,7 +252,7 @@ void EventsManager::startFade(CMapResource *cMap) { int mapIndex = 0; for (int idx = _fadeFirstCol; idx <= _fadeLastCol; ++idx, vgaP += 3) { - Common::copy(&cMap->_entries[mapIndex], &cMap->_entries[mapIndex + 2], vgaP); + Common::copy(&cMap->_entries[mapIndex], &cMap->_entries[mapIndex + 3], vgaP); if (!(cMap->_fadeStatus & 1)) mapIndex += 3; diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp index 035162bd2b..992fb5ad05 100644 --- a/engines/voyeur/files.cpp +++ b/engines/voyeur/files.cpp @@ -1179,7 +1179,7 @@ CMapResource::CMapResource(BoltFilesState &state, const byte *src): _vm(state._v _start = READ_LE_UINT16(src + 2); _end = READ_LE_UINT16(src + 4); - int count = _end - _start; + int count = _end - _start + 1; _entries = new byte[count * 3]; Common::copy(src + 6, src + 6 + 3 * count, _entries); |