COMPOSER: Fix z-ordering issues.

2 files changed, 4 insertions, 3 deletions

diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index 936f1ff595..acd1d33e65 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -457,7 +457,7 @@ void ComposerEngine::processAnimFrame() {
 	}
 }
 
-void ComposerEngine::addSprite(uint16 id, uint16 animId, uint16 zorder, const Common::Point &pos) {
+void ComposerEngine::addSprite(uint16 id, uint16 animId, int16 zorder, const Common::Point &pos) {
 	Sprite sprite;
 	sprite.id = id;
 	sprite.animId = animId;
@@ -471,6 +471,7 @@ void ComposerEngine::addSprite(uint16 id, uint16 animId, uint16 zorder, const Co
 	for (Common::List<Sprite>::iterator i = _sprites.begin(); i != _sprites.end(); i++) {
 		if (sprite.zorder > i->zorder)
 			continue;
+		i++;
 		_sprites.insert(i, sprite);
 		return;
 	}
diff --git a/engines/composer/composer.h b/engines/composer/composer.h
index 4955a0ce3a..a90eb61459 100644
--- a/engines/composer/composer.h
+++ b/engines/composer/composer.h
@@ -62,7 +62,7 @@ class ComposerEngine;
 struct Sprite {
 	uint16 id;
 	uint16 animId;
-	uint16 zorder;
+	int16 zorder;
 	Common::Point pos;
 	Graphics::Surface surface;
 };
@@ -195,7 +195,7 @@ private:
 	void playWaveForAnim(uint16 id, bool bufferingOnly);
 	void processAnimFrame();
 
-	void addSprite(uint16 id, uint16 animId, uint16 zorder, const Common::Point &pos);
+	void addSprite(uint16 id, uint16 animId, int16 zorder, const Common::Point &pos);
 	void removeSprite(uint16 id, uint16 animId);
 
 	void loadCTBL(uint id, uint fadePercent);