diff options
| author | Colin Snover | 2017-01-18 11:48:40 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-03-30 19:46:27 -0500 |
| commit | 6b0cd955faf6df00a55664ef30cb8e6cf981bc6e (patch) | |
| tree | 90f2a86fa9587638bf6c0745f3de75d4e81d930c | |
| parent | fa9523933f69497bae19510ff1c7f17e4cbe8024 (diff) | |
| download | scummvm-rg350-6b0cd955faf6df00a55664ef30cb8e6cf981bc6e.tar.gz scummvm-rg350-6b0cd955faf6df00a55664ef30cb8e6cf981bc6e.tar.bz2 scummvm-rg350-6b0cd955faf6df00a55664ef30cb8e6cf981bc6e.zip | |
SCI32: Fix crash when using brightness slider in Shivers
| -rw-r--r-- | engines/sci/engine/kernel_tables.h | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kgraphics32.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index 46132d3794..6f696c4a69 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -306,7 +306,7 @@ static const SciKernelMapSubEntry kPalette_subops[] = { { SIG_SCI32, 1, MAP_CALL(PaletteSetFromResource32), "i(i)", NULL }, { SIG_SCI32, 2, MAP_CALL(PaletteSetFade), "iii", NULL }, { SIG_SCI32, 3, MAP_CALL(PaletteFindColor32), "iii", NULL }, - { SIG_SCI3, 4, MAP_CALL(PaletteSetGamma), "i", NULL }, + { SIG_SCI32, 4, MAP_CALL(PaletteSetGamma), "i", NULL }, #endif SCI_SUBOPENTRY_TERMINATOR }; diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp index f6aeeb7f9e..07a63c73d9 100644 --- a/engines/sci/engine/kgraphics32.cpp +++ b/engines/sci/engine/kgraphics32.cpp @@ -935,8 +935,8 @@ reg_t kPaletteFindColor32(EngineState *s, int argc, reg_t *argv) { } /* - * Used in SCI3. SCI3 contains 6 gamma look-up tables, with the first - * table (gamma = 0) being the default one. + * Used starting in Shivers 1. SCI3 contains 6 gamma look-up tables, with the + * first table (gamma = 0) being the default one. */ reg_t kPaletteSetGamma(EngineState *s, int argc, reg_t *argv) { const uint8 gamma = argv[0].toUint16(); |