aboutsummaryrefslogtreecommitdiff
path: root/scumm/instrument.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-04-28 10:34:48 +0000
committerTorbjörn Andersson2005-04-28 10:34:48 +0000
commit589b65945ac2b257a88c15808f5c35fe4a74aff6 (patch)
tree9bb6853d1e3c48fa039fcbb8e5f0e41ded45b55b /scumm/instrument.h
parent98ed7a10d093286eca3b23226bcb45d6885630e9 (diff)
downloadscummvm-rg350-589b65945ac2b257a88c15808f5c35fe4a74aff6.tar.gz
scummvm-rg350-589b65945ac2b257a88c15808f5c35fe4a74aff6.tar.bz2
scummvm-rg350-589b65945ac2b257a88c15808f5c35fe4a74aff6.zip
This should fix a crash which could happen when placing several objects too
close to each other on the ground. (Happened to me on the first level after destroying the voodoo doll, where I'd drop the banana, the soap and the false nose close to each other on the ground after using them.) Reasoning behind the change: From what I understand, map_itemsMap[] contains information for each "cell" of the map about which objects are there. Each cell can contain two objects which are stored in the upper and lower byte of a 16-bit word. When dropping an object, it is written into map_itemsMap[], but not just to the indicated cell but also to a few of the surrounding ones. Presumably to make it easier to pick it up afterwards. When writing an object to a cell, we check if one of the bytes is already occupied. If it is, write to the other byte. Otherwise, write to that byte. (If both bytes are occupied, one will be overwritten.) The old code assumed that if one byte was free at position (x,y) the same byte would automatically be the free one in the surrounding cells. This could cause bad values in the array, since the item was added to an existing value, rather than replacing it. This new code makes the check for each cell that is modified. (It also gets rid of some code duplication.) svn-id: r17851
Diffstat (limited to 'scumm/instrument.h')
0 files changed, 0 insertions, 0 deletions