aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-05-24 15:05:23 -0400
committerPaul Gilbert2014-05-24 15:05:23 -0400
commit0d54216beb634ee3c8ef1be12b5935d63f040746 (patch)
tree260cd8ae329655aa5d0eca7995323802c6022759
parent722b32506e5d28a5037b1bb1bef6f8759af13423 (diff)
downloadscummvm-rg350-0d54216beb634ee3c8ef1be12b5935d63f040746.tar.gz
scummvm-rg350-0d54216beb634ee3c8ef1be12b5935d63f040746.tar.bz2
scummvm-rg350-0d54216beb634ee3c8ef1be12b5935d63f040746.zip
MADS: Fix checks for assets count when calling releasePlayerSprites
-rw-r--r--engines/mads/game.cpp2
-rw-r--r--engines/mads/player.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index f8d6c36ebf..ac77aec4ae 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -170,7 +170,7 @@ void Game::gameLoop() {
sectionLoop();
_player.releasePlayerSprites();
- assert(_scene._sprites.size() == 0);
+ assert(_scene._sprites._assetCount == 0);
_vm->_palette->unlock();
_vm->_events->waitCursor();
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index a9c9f113ff..a9bc0cd485 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -694,8 +694,7 @@ void Player::releasePlayerSprites() {
_spritesLoaded = false;
_spritesChanged = true;
- // FIXME: Find out why this occurs
- if (scene._sprites.size() > 0) {
+ if (scene._sprites._assetCount > 0) {
warning("Player::releasePlayerSprites(): leftover sprites remain, clearing list");
scene._sprites.clear();
}