diff options
| author | Paul Gilbert | 2013-06-01 20:07:20 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-06-01 20:07:20 -0400 |
| commit | e9e596e741b70a9a6b3481732ca2dd37adefe8f6 (patch) | |
| tree | f8b0f58a83dd56537f851ac191111a45a1712d6f /engines | |
| parent | 0dc30622d3348321527d57e892dfadfc41b4c025 (diff) | |
| download | scummvm-rg350-e9e596e741b70a9a6b3481732ca2dd37adefe8f6.tar.gz scummvm-rg350-e9e596e741b70a9a6b3481732ca2dd37adefe8f6.tar.bz2 scummvm-rg350-e9e596e741b70a9a6b3481732ca2dd37adefe8f6.zip | |
VOYEUR: Fixes for recent changes to ViewPortResource initialisation
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/voyeur/files.cpp | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp index 8522cc77d7..758ba9f481 100644 --- a/engines/voyeur/files.cpp +++ b/engines/voyeur/files.cpp @@ -616,17 +616,24 @@ ViewPortResource::ViewPortResource(BoltFilesState &state, const byte *src): state._curLibPtr->resolveIt(READ_LE_UINT32(src + 0x30), &_field30); // Get the rect list - for (int i = 0; i < 3; ++i) { - _rectListCount[i] = (int16)READ_LE_UINT16(src + 0x40 + 2 * i); + for (int listIndex = 0; listIndex < 3; ++listIndex) { + _rectListCount[listIndex] = (int16)READ_LE_UINT16(src + 0x40 + 2 * listIndex); + uint32 id = READ_LE_UINT32(src + 0x34 + listIndex * 4); - int16 *rectList = (int16 *)state._curLibPtr->memberAddrOffset(READ_LE_UINT32(src + 0x34 + i * 4)); - _rectListPtr[i] = new Common::Array<Common::Rect>(); - - for (int i = 0; i < _rectListCount[0]; ++i) { - int xs = FROM_LE_16(rectList[0]); - int ys = FROM_LE_16(rectList[1]); - _rectListPtr[i]->push_back(Common::Rect(xs, ys, xs + FROM_LE_16(rectList[2]), - ys + FROM_LE_16(rectList[3]))); + if (id == -1) { + _rectListPtr[listIndex] = NULL; + } else { + _rectListPtr[listIndex] = new Common::Array<Common::Rect>(); + + if (_rectListCount[listIndex] > 0) { + int16 *rectList = (int16 *)state._curLibPtr->memberAddrOffset(id); + for (int i = 0; i < _rectListCount[listIndex]; ++i) { + int xs = FROM_LE_16(rectList[0]); + int ys = FROM_LE_16(rectList[1]); + _rectListPtr[i]->push_back(Common::Rect(xs, ys, xs + FROM_LE_16(rectList[2]), + ys + FROM_LE_16(rectList[3]))); + } + } } } |