diff options
| author | Paweł Kołodziejski | 2003-07-19 20:10:40 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-07-19 20:10:40 +0000 |
| commit | 2056a62f98ee2fe43e71a12ba74f69cacbbddcae (patch) | |
| tree | b6c33d1f7f42ddaca6b78259db390abf5da5f8c1 | |
| parent | 2fbf782c05bf5ff06e2817e487e152e8739be9ee (diff) | |
| download | scummvm-rg350-2056a62f98ee2fe43e71a12ba74f69cacbbddcae.tar.gz scummvm-rg350-2056a62f98ee2fe43e71a12ba74f69cacbbddcae.tar.bz2 scummvm-rg350-2056a62f98ee2fe43e71a12ba74f69cacbbddcae.zip | |
moved up code for v1 setActorPalette func
svn-id: r9084
| -rw-r--r-- | scumm/costume.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index a31175b9c4..4df47a0e98 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -719,6 +719,9 @@ void CostumeRenderer::setPalette(byte *palette) { int i; byte color; + if (_loaded._format == 0x57) + return; + if (_vm->_features & GF_OLD_BUNDLE) { if ((_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) { memcpy(_palette, palette, 16); @@ -726,8 +729,6 @@ void CostumeRenderer::setPalette(byte *palette) { memset(_palette, 8, 16); _palette[12] = 0; } - if (_loaded._format == 0x57) - return; _palette[_loaded._palette[0]] = _palette[0]; } else { if ((_vm->_features & GF_NEW_OPCODES) || (_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) { |