diff options
| author | Jody Northup | 2009-08-21 09:37:51 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-08-21 09:37:51 +0000 |
| commit | 3084919b32771d43d17fdd5d584505cd31d20b72 (patch) | |
| tree | 3f42b5e0cb69f340ccd30fad96f6ee4e51e260cf /engines/scumm/costume.cpp | |
| parent | cba2897cc8f7b70d27fc75ca8b8d55cde4738e4a (diff) | |
| parent | 89d7fea4e619cd44d5ce16eee1e46ad417e26c9c (diff) | |
| download | scummvm-rg350-3084919b32771d43d17fdd5d584505cd31d20b72.tar.gz scummvm-rg350-3084919b32771d43d17fdd5d584505cd31d20b72.tar.bz2 scummvm-rg350-3084919b32771d43d17fdd5d584505cd31d20b72.zip | |
Merged RGB color API and support in from /scummvm/branches/gsoc2009-16bit/
svn-id: r43577
Diffstat (limited to 'engines/scumm/costume.cpp')
| -rw-r--r-- | engines/scumm/costume.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp index 57b793d579..6923c27b38 100644 --- a/engines/scumm/costume.cpp +++ b/engines/scumm/costume.cpp @@ -791,7 +791,7 @@ byte ClassicCostumeRenderer::drawLimb(const Actor *a, int limb) { } -void NESCostumeRenderer::setPalette(byte *palette) { +void NESCostumeRenderer::setPalette(uint16 *palette) { // TODO } @@ -874,17 +874,20 @@ void ClassicCostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) } while (mask&0xFFFF); } -void ClassicCostumeRenderer::setPalette(byte *palette) { +void ClassicCostumeRenderer::setPalette(uint16 *palette) { int i; byte color; if (_loaded._format == 0x57) { - memcpy(_palette, palette, 13); + for (i = 0; i < 13; i++) + _palette[i] = palette[i]; } else if (_vm->_game.features & GF_OLD_BUNDLE) { if (_vm->getCurrentLights() & LIGHTMODE_actor_use_colors) { - memcpy(_palette, palette, 16); + for (i = 0; i < 16; i++) + _palette[i] = palette[i]; } else { - memset(_palette, 8, 16); + for (i = 0; i < 16; i++) + _palette[i] = 8; _palette[12] = 0; } _palette[_loaded._palette[0]] = _palette[0]; |