From 7edfab28d82f4c15bf95ad63d0ce480676f85c62 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Fri, 5 Jun 2009 06:47:49 +0000 Subject: Ooops, correct mistakes in commit 41162. svn-id: r41192 --- engines/scumm/costume.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp index 089e7a2fbe..39c2f73e88 100644 --- a/engines/scumm/costume.cpp +++ b/engines/scumm/costume.cpp @@ -876,15 +876,15 @@ void ClassicCostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) void ClassicCostumeRenderer::setPalette(uint16 *palette) { int i; - byte color = 0; + byte color; if (_loaded._format == 0x57) { for (i = 0; i < 13; i++) - _palette[i] = color; + _palette[i] = palette[i]; } else if (_vm->_game.features & GF_OLD_BUNDLE) { if (_vm->getCurrentLights() & LIGHTMODE_actor_use_colors) { for (i = 0; i < 16; i++) - _palette[i] = color; + _palette[i] = palette[i]; } else { for (i = 0; i < 16; i++) _palette[i] = 8; -- cgit v1.2.3