diff options
| author | Travis Howell | 2004-10-10 11:31:22 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-10-10 11:31:22 +0000 |
| commit | e5b97ee63b20aebf5a44098e6d377042c7ac8569 (patch) | |
| tree | 196999dc4686243992ecfafa1a4e84c74bb70656 /scumm | |
| parent | 544266d971e8df1078831b09bda76e70f2e9ce53 (diff) | |
| download | scummvm-rg350-e5b97ee63b20aebf5a44098e6d377042c7ac8569.tar.gz scummvm-rg350-e5b97ee63b20aebf5a44098e6d377042c7ac8569.tar.bz2 scummvm-rg350-e5b97ee63b20aebf5a44098e6d377042c7ac8569.zip | |
Correct order
svn-id: r15506
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v72he.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 6e63637289..f7808b89e6 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -1405,13 +1405,13 @@ void ScummEngine_v72he::o72_arrayOps() { if (id == 0) { defineArray(array, kDwordArray, dim2start, dim2end, dim1start, dim1end); } - tmp2 = len; + tmp2 = 0; while (dim2start <= dim2end) { tmp = dim1start; while (tmp <= dim1end) { - writeArray(array, dim2start, tmp, list[--tmp2]); - if (tmp2 == 0) - tmp2 = len; + writeArray(array, dim2start, tmp, list[tmp2++]); + if (tmp2 == len) + tmp2 = 0; tmp++; } dim2start++; @@ -1601,10 +1601,7 @@ uint8 *ScummEngine_v72he::drawWizImage(int restype, const WizImage *pwi) { const uint8 *dataPtr = getResourceAddress(restype, pwi->resNum); if (dataPtr) { const uint8 *wizh = findWrappedBlock(MKID('WIZH'), dataPtr, pwi->state, 0); - if (!wizh) { - warning("WIZH not found"); - return 0; - } + assert(wizh); uint32 comp = READ_LE_UINT32(wizh + 0x0); uint32 width = READ_LE_UINT32(wizh + 0x4); uint32 height = READ_LE_UINT32(wizh + 0x8); |