mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-14 13:58:01 +00:00
Fix some bad memory accesses in LoomCD. The masking is still bad but
at least Valgrind is not accusing ScummVM to be too buggy anymore :-) svn-id: r4153
This commit is contained in:
parent
b47a9a0013
commit
04efaa9175
@ -282,11 +282,11 @@ byte CostumeRenderer::mainRoutine(Actor * a, int slot, int frame)
|
|||||||
_vm->virtscr[0].topline + _bottom);
|
_vm->virtscr[0].topline + _bottom);
|
||||||
masking = 0;
|
masking = 0;
|
||||||
|
|
||||||
if (_zbuf) {
|
if (_vm->_features & GF_SMALL_HEADER)
|
||||||
|
masking = _zbuf;
|
||||||
|
else
|
||||||
masking = _vm->isMaskActiveAt(_left, _top, _right, _bottom,_vm->getResourceAddress(rtBuffer,9) +
|
masking = _vm->isMaskActiveAt(_left, _top, _right, _bottom,_vm->getResourceAddress(rtBuffer,9) +
|
||||||
_vm->gdi._imgBufOffs[_zbuf] +
|
_vm->gdi._imgBufOffs[_zbuf] + _vm->_screenStartStrip);
|
||||||
_vm->_screenStartStrip);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_zbuf || charsetmask) {
|
if (_zbuf || charsetmask) {
|
||||||
_mask_ptr =_vm->getResourceAddress(rtBuffer,9) + _ypos * 40 + _vm->_screenStartStrip;
|
_mask_ptr =_vm->getResourceAddress(rtBuffer,9) + _ypos * 40 + _vm->_screenStartStrip;
|
||||||
@ -1045,7 +1045,6 @@ byte Scumm::cost_increaseAnim(LoadedCostume * lc, Actor * a, int slot)
|
|||||||
if (i != end)
|
if (i != end)
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
nc = lc->_dataptr[i];
|
nc = lc->_dataptr[i];
|
||||||
|
|
||||||
if (nc == 0x7C) {
|
if (nc == 0x7C) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user