diff options
| author | uruk | 2013-07-29 19:17:43 +0200 |
|---|---|---|
| committer | uruk | 2013-07-29 19:17:43 +0200 |
| commit | 3b11fc12240650bfdf693a31b09d6349c1bf3f61 (patch) | |
| tree | d89a8181306974a4b381d8a196f52e4a6f009182 | |
| parent | a1f87fdaebc86be92b189086bba1dba0d3e049c6 (diff) | |
| download | scummvm-rg350-3b11fc12240650bfdf693a31b09d6349c1bf3f61.tar.gz scummvm-rg350-3b11fc12240650bfdf693a31b09d6349c1bf3f61.tar.bz2 scummvm-rg350-3b11fc12240650bfdf693a31b09d6349c1bf3f61.zip | |
AVALANCHE: Repair Celer::load_chunks(), remove background drawing from Graphics::drawSprite().
| -rw-r--r-- | engines/avalanche/celer2.cpp | 6 | ||||
| -rw-r--r-- | engines/avalanche/graphics.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/avalanche/celer2.cpp b/engines/avalanche/celer2.cpp index 4d4a1fa872..061eb6b212 100644 --- a/engines/avalanche/celer2.cpp +++ b/engines/avalanche/celer2.cpp @@ -306,10 +306,10 @@ void Celer::load_chunks(Common::String xx) { if (ch.natural) { memos[fv].flavour = ch_natural_image; // We simply read from the screen and later, in display_it() we draw it right back. - memos[fv].size = memos[fv].xl * 8 * memos[fv].yl; - memory[fv].create(memos[fv].xl * 8, memos[fv].yl, ::Graphics::PixelFormat::createFormatCLUT8()); + memos[fv].size = memos[fv].xl * 8 * memos[fv].yl + 1; + memory[fv].create(memos[fv].xl * 8, memos[fv].yl + 1, ::Graphics::PixelFormat::createFormatCLUT8()); - for (uint16 j = 0; j < memos[fv].yl; j++) + for (uint16 j = 0; j < memos[fv].yl + 1; j++) for (uint16 i = 0; i < memos[fv].xl * 8; i++) *(byte *)memory[fv].getBasePtr(i, j) = *_vm->_graphics->getPixel(memos[fv].x * 8 + i, memos[fv].y + j); } else { diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp index 6338893dbf..957468044c 100644 --- a/engines/avalanche/graphics.cpp +++ b/engines/avalanche/graphics.cpp @@ -86,8 +86,6 @@ void Graphics::drawBar(int16 x1, int16 y1, int16 x2, int16 y2, int16 color) { } void Graphics::drawSprite(const SpriteInfo &sprite, byte picnum, int16 x, int16 y) { - drawPicture(_background, 0, 10); - /* First we make the pixels of the spirte blank. */ for (byte qay = 0; qay < sprite.yl; qay++) { byte *mask = new byte[sprite.xl]; |