diff options
| author | Oystein Eftevaag | 2006-01-10 02:43:30 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2006-01-10 02:43:30 +0000 |
| commit | 6946efeb7f87d104ba5416935032c01033b7b805 (patch) | |
| tree | a0527974b9270d492ef76daf9d8422640c635255 /kyra/sprites.cpp | |
| parent | 713a646409fed4ff46c61f1cc6417b5fe8d3d8c9 (diff) | |
| download | scummvm-rg350-6946efeb7f87d104ba5416935032c01033b7b805.tar.gz scummvm-rg350-6946efeb7f87d104ba5416935032c01033b7b805.tar.bz2 scummvm-rg350-6946efeb7f87d104ba5416935032c01033b7b805.zip | |
Fixed regression bug #1400707, and reenabled mouselocking with a fix,
to remove the mouse flickering under cutscenes and such.
svn-id: r19962
Diffstat (limited to 'kyra/sprites.cpp')
| -rw-r--r-- | kyra/sprites.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kyra/sprites.cpp b/kyra/sprites.cpp index 89bdc0cbb6..91563d2ee5 100644 --- a/kyra/sprites.cpp +++ b/kyra/sprites.cpp @@ -88,7 +88,7 @@ void Sprites::setupSceneAnims() { data += 4; _anims[i].y = READ_LE_UINT16(data); data += 4; - _anims[i].width = *(data)/8 + 1; + _anims[i].width = *(data) - 1; data += 4; _anims[i].height = *(data); data += 4; @@ -111,14 +111,14 @@ void Sprites::setupSceneAnims() { int bkgdHeight = _anims[i].height; if (_anims[i].width2) - bkgdWidth += (_anims[i].width2 >> 3) + 1; + bkgdWidth += _anims[i].width2 << 3; if (_anims[i].height2) bkgdHeight += _anims[i].height2; _anims[i].background = (uint8 *)malloc(_screen->getRectSize(bkgdWidth + 1, bkgdHeight)); memset(_anims[i].background, 0, _screen->getRectSize(bkgdWidth + 1, bkgdHeight)); - //_anims[i].background = (uint8 *)malloc(100*100); + assert(_anims[i].background); } } |