diff options
| author | Travis Howell | 2009-06-05 06:47:49 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-06-05 06:47:49 +0000 |
| commit | 7edfab28d82f4c15bf95ad63d0ce480676f85c62 (patch) | |
| tree | 81b5766d385969bdd2051315523f4ec738e22be1 | |
| parent | f8361b5c53b96faddb56024bb932ce46b7005dbf (diff) | |
| download | scummvm-rg350-7edfab28d82f4c15bf95ad63d0ce480676f85c62.tar.gz scummvm-rg350-7edfab28d82f4c15bf95ad63d0ce480676f85c62.tar.bz2 scummvm-rg350-7edfab28d82f4c15bf95ad63d0ce480676f85c62.zip | |
Ooops, correct mistakes in commit 41162.
svn-id: r41192
| -rw-r--r-- | engines/scumm/costume.cpp | 6 |
1 files 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; |