thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMPOSER: Misc sprite changes.

Browse source
This commit is contained in:
Alyssa Milburn 2011-07-16 20:04:49 +02:00
parent c95320bb17
commit 1cf09e3fbf
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/composer/composer.cpp
View file

@ -493,6 +493,9 @@ void ComposerEngine::processAnimFrame() {
} }
void ComposerEngine::addSprite(uint16 id, uint16 animId, uint16 zorder, const Common::Point &pos) { void ComposerEngine::addSprite(uint16 id, uint16 animId, uint16 zorder, const Common::Point &pos) {
// TODO: re-use old sprite
removeSprite(id, animId);
Sprite sprite; Sprite sprite;
sprite.id = id; sprite.id = id;
sprite.animId = animId; sprite.animId = animId;
@ -521,7 +524,6 @@ void ComposerEngine::removeSprite(uint16 id, uint16 animId) {
continue; continue;
i->surface.free(); i->surface.free();
i = _sprites.reverse_erase(i); i = _sprites.reverse_erase(i);
return;
} }
} }
@ -1457,8 +1459,10 @@ bool ComposerEngine::initSprite(Sprite &sprite) {
uint32 size = stream->readUint32LE(); uint32 size = stream->readUint32LE();
debug(1, "loading BMAP: type %d, width %d, height %d, size %d", type, width, height, size); debug(1, "loading BMAP: type %d, width %d, height %d, size %d", type, width, height, size);
if (width && height) {
sprite.surface.create(width, height, Graphics::PixelFormat::createFormatCLUT8()); sprite.surface.create(width, height, Graphics::PixelFormat::createFormatCLUT8());
decompressBitmap(type, stream, (byte *)sprite.surface.pixels, size, width, height); decompressBitmap(type, stream, (byte *)sprite.surface.pixels, size, width, height);
}
delete stream; delete stream;
return true; return true;