diff options
| author | Willem Jan Palenstijn | 2016-03-01 11:06:40 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2016-03-01 11:32:02 +0100 |
| commit | d03ab8b716f588b1558427be3d269af2425ffc10 (patch) | |
| tree | a22dfd88ee04067d10c8c44fbfa8e32eb1be5ea5 /engines | |
| parent | 27e5cfbd1b42c86c21339b474986e621e0e5dbf4 (diff) | |
| download | scummvm-rg350-d03ab8b716f588b1558427be3d269af2425ffc10.tar.gz scummvm-rg350-d03ab8b716f588b1558427be3d269af2425ffc10.tar.bz2 scummvm-rg350-d03ab8b716f588b1558427be3d269af2425ffc10.zip | |
SCI32: Revert GK1 hacks
Replacing a valid signature error by a warning isn't useful.
Diffstat (limited to 'engines')
| -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 43e02de077..d3b2bfee54 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -213,7 +213,7 @@ static const SciKernelMapSubEntry kPalVary_subops[] = { { SIG_SCI16, 6, MAP_CALL(PalVaryPauseResume), "i", NULL }, #ifdef ENABLE_SCI32 { SIG_SCI32, 0, MAP_CALL(PalVarySetVary), "i(i)(i)(ii)", NULL }, - { SIG_SCI32, 1, MAP_CALL(PalVarySetPercent), "(i)(i)(i)", NULL }, + { SIG_SCI32, 1, MAP_CALL(PalVarySetPercent), "(i)(i)", NULL }, { SIG_SCI32, 2, MAP_CALL(PalVaryGetPercent), "", NULL }, { SIG_SCI32, 3, MAP_CALL(PalVaryOff), "", NULL }, { SIG_SCI32, 4, MAP_CALL(PalVaryMergeTarget), "i", NULL }, diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp index 2be47b8a0c..5810a59ff6 100644 --- a/engines/sci/engine/kgraphics32.cpp +++ b/engines/sci/engine/kgraphics32.cpp @@ -798,10 +798,10 @@ reg_t kPalVarySetVary(EngineState *s, int argc, reg_t *argv) { reg_t kPalVarySetPercent(EngineState *s, int argc, reg_t *argv) { int time = argc > 0 ? argv[0].toSint16() * 60 : 0; int16 percent = argc > 1 ? argv[1].toSint16() : 0; + // TODO: GK1 adds a third optional parameter here, at the end of chapter 1 // (during the sunset/sunrise sequence, the parameter is 1) - if (argc > 2) - warning("kPalVarySetPercent: third parameter passed: %d", argv[2].toSint16()); + g_sci->_gfxPalette32->setVaryPercent(percent, time, -1, -1); return NULL_REG; } |