From 2fc49ba2b958f664165b9a0b16789696c30a8a3c Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Tue, 19 Jul 2011 16:11:27 +0200
Subject: COMPOSER: Implement kFuncClearSprites.

---
 engines/composer/graphics.cpp  | 2 +-
 engines/composer/scripting.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/composer/graphics.cpp b/engines/composer/graphics.cpp
index e6b87478c7..65a12dd6a8 100644
--- a/engines/composer/graphics.cpp
+++ b/engines/composer/graphics.cpp
@@ -419,7 +419,7 @@ void ComposerEngine::addSprite(uint16 id, uint16 animId, uint16 zorder, const Co
 
 void ComposerEngine::removeSprite(uint16 id, uint16 animId) {
 	for (Common::List<Sprite>::iterator i = _sprites.begin(); i != _sprites.end(); i++) {
-		if (id && i->_id != id)
+		if (!i->_id || (id && i->_id != id))
 			continue;
 		if (i->_animId && animId && (i->_animId != animId))
 			continue;
diff --git a/engines/composer/scripting.cpp b/engines/composer/scripting.cpp
index ff5391eceb..5df83e4f8e 100644
--- a/engines/composer/scripting.cpp
+++ b/engines/composer/scripting.cpp
@@ -660,8 +660,8 @@ int16 ComposerEngine::scriptFuncCall(uint16 id, int16 param1, int16 param2, int1
 		warning("ignoring kFuncSetBackgroundColor(%d)", param1);
 		return 0;
 	case kFuncClearSprites:
-		// TODO
-		warning("ignoring kFuncClearSprites()");
+		debug(3, "kFuncClearSprites()");
+		removeSprite(0, 0);
 		return 0;
 	case kFuncAddSprite:
 		{
-- 
cgit v1.2.3