From 62a22b62931fc43705a9bf62383e58896b53ddb4 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Thu, 4 Aug 2011 21:50:17 +0200
Subject: COMPOSER: Fix a warning and an uninitialized value.

---
 engines/composer/graphics.cpp | 2 +-
 engines/composer/resource.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/composer/graphics.cpp b/engines/composer/graphics.cpp
index 3de244970e..5c9fc6e1f7 100644
--- a/engines/composer/graphics.cpp
+++ b/engines/composer/graphics.cpp
@@ -506,7 +506,7 @@ void ComposerEngine::loadCTBL(uint16 id, uint fadePercent) {
 	stream->read(buffer, numEntries * 3);
 	delete stream;
 
-	for (uint i = 0; i < numEntries * 3; i++)
+	for (uint16 i = 0; i < numEntries * 3; i++)
 		buffer[i] = ((unsigned int)buffer[i] * fadePercent) / 100;
 
 	_system->getPaletteManager()->setPalette(buffer, 0, numEntries);
diff --git a/engines/composer/resource.cpp b/engines/composer/resource.cpp
index e0893380bf..b40bdb379b 100644
--- a/engines/composer/resource.cpp
+++ b/engines/composer/resource.cpp
@@ -251,6 +251,7 @@ bool ComposerArchive::openStream(Common::SeekableReadStream *stream) {
 Pipe::Pipe(Common::SeekableReadStream *stream) {
 	_offset = 0;
 	_stream = stream;
+	_anim = NULL;
 
 	nextFrame();
 }
-- 
cgit v1.2.3