diff options
| author | Filippos Karapetis | 2016-03-01 04:12:03 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2016-03-01 04:12:36 +0200 |
| commit | 6ba31a88f044fef6f2669f4bec43409f8dd799bc (patch) | |
| tree | 982b5ff095235a77c8609395cdc1de10d82570cd | |
| parent | 1f217e3834a1ff2eceee2012dbfffbaa9b68ff7b (diff) | |
| download | scummvm-rg350-6ba31a88f044fef6f2669f4bec43409f8dd799bc.tar.gz scummvm-rg350-6ba31a88f044fef6f2669f4bec43409f8dd799bc.tar.bz2 scummvm-rg350-6ba31a88f044fef6f2669f4bec43409f8dd799bc.zip | |
SCI32: GK1 adds another optional parameter to kPalVarySetPercent
| -rw-r--r-- | engines/sci/engine/kernel_tables.h | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kgraphics32.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index d3b2bfee54..43e02de077 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)", NULL }, + { SIG_SCI32, 1, MAP_CALL(PalVarySetPercent), "(i)(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 706edc87c6..78afa184f1 100644 --- a/engines/sci/engine/kgraphics32.cpp +++ b/engines/sci/engine/kgraphics32.cpp @@ -798,6 +798,8 @@ 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) g_sci->_gfxPalette32->setVaryPercent(percent, time, -1, -1); return NULL_REG; } |