diff options
| author | Matthew Hoops | 2009-08-15 14:50:21 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2009-08-15 14:50:21 +0000 |
| commit | 8e417b0884e676ff5fe297d1642c9d8499ad9b90 (patch) | |
| tree | 9c780b7fcbec500bda0d01d0b04e32e4ef013b3d /engines/scumm | |
| parent | 7ff9bb3a6b543777891d90a645c669b975e64445 (diff) | |
| download | scummvm-rg350-8e417b0884e676ff5fe297d1642c9d8499ad9b90.tar.gz scummvm-rg350-8e417b0884e676ff5fe297d1642c9d8499ad9b90.tar.bz2 scummvm-rg350-8e417b0884e676ff5fe297d1642c9d8499ad9b90.zip | |
Fix compile when compiling with --disable-he
svn-id: r43410
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/akos.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/cursor.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp index f4bb8a2c8b..c7f53b9763 100644 --- a/engines/scumm/akos.cpp +++ b/engines/scumm/akos.cpp @@ -299,6 +299,7 @@ void AkosRenderer::setPalette(uint16 *new_palette) { if (size > 256) error("akos_setPalette: %d is too many colors", size); +#ifdef ENABLE_HE if (_vm->_game.features & GF_16BIT_COLOR) { if (_paletteNum) { for (i = 0; i < size; i++) @@ -317,10 +318,13 @@ void AkosRenderer::setPalette(uint16 *new_palette) { for (i = 0; i < size; i++) _palette[i] = (byte)_vm->_hePalettes[_paletteNum * _vm->_hePaletteSlot + 768 + akpl[i]]; } else { +#endif for (i = 0; i < size; i++) { _palette[i] = new_palette[i] != 0xFF ? new_palette[i] : akpl[i]; } +#ifdef ENABLE_HE } +#endif if (_vm->_game.heversion == 70) { for (i = 0; i < size; i++) diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 66ac68bd95..5af25e95ef 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -194,15 +194,19 @@ void ScummEngine_v70he::setDefaultCursor() { for (j = 0; j < 32; j++) { switch ((p & (0x3 << 14)) >> 14) { case 1: +#ifdef ENABLE_HE if (_bitDepth == 2) WRITE_UINT16(_grabbedCursor + 64 * i + j * 2, get16BitColor(palette[4], palette[5], palette[6])); else +#endif _grabbedCursor[32 * i + j] = 0xfe; break; case 2: +#ifdef ENABLE_HE if (_bitDepth == 2) WRITE_UINT16(_grabbedCursor + 64 * i + j * 2, get16BitColor(palette[0], palette[1], palette[2])); else +#endif _grabbedCursor[32 * i + j] = 0xfd; break; default: |