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

COMPOSER: Fix removeSprite behaviour.

Browse source
This commit is contained in:
Alyssa Milburn 2011-07-15 23:43:13 +02:00
parent f81010887f
commit f396e77cac
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/composer/composer.cpp
View file

@ -421,7 +421,7 @@ void ComposerEngine::processAnimFrame() {
case 4:
if (entry.word10 && (!data || data != entry.word10)) {
debug(4, "anim: erase sprite %d", entry.word10);
removeSprite(data, anim->_id);
removeSprite(entry.word10, anim->_id);
}
if (data) {
uint16 x = anim->_stream->readUint16LE();
@ -471,7 +471,7 @@ void ComposerEngine::removeSprite(uint16 id, uint16 animId) {
for (Common::List<Sprite>::iterator i = _sprites.begin(); i != _sprites.end(); i++) {
if (i->id != id)
continue;
if (animId && i->animId != animId)
if (i->animId && animId && (i->animId != animId))
continue;
i = _sprites.reverse_erase(i);
return;