diff options
| author | Alyssa Milburn | 2011-08-04 21:50:17 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-04 21:50:17 +0200 |
| commit | 62a22b62931fc43705a9bf62383e58896b53ddb4 (patch) | |
| tree | 352a4cc96ad42f2a82f499b2d015202dc990e5b3 /engines | |
| parent | 7356b83faf2fa04ca4d439cdb17314247f03e96d (diff) | |
| download | scummvm-rg350-62a22b62931fc43705a9bf62383e58896b53ddb4.tar.gz scummvm-rg350-62a22b62931fc43705a9bf62383e58896b53ddb4.tar.bz2 scummvm-rg350-62a22b62931fc43705a9bf62383e58896b53ddb4.zip | |
COMPOSER: Fix a warning and an uninitialized value.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/composer/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/composer/resource.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
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(); } |