[Scummvm-cvs-logs] scummvm master -> 6ba31a88f044fef6f2669f4bec43409f8dd799bc
bluegr
bluegr at gmail.com
Tue Mar 1 03:13:09 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6ba31a88f0 SCI32: GK1 adds another optional parameter to kPalVarySetPercent
Commit: 6ba31a88f044fef6f2669f4bec43409f8dd799bc
https://github.com/scummvm/scummvm/commit/6ba31a88f044fef6f2669f4bec43409f8dd799bc
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-03-01T04:12:36+02:00
Commit Message:
SCI32: GK1 adds another optional parameter to kPalVarySetPercent
Changed paths:
engines/sci/engine/kernel_tables.h
engines/sci/engine/kgraphics32.cpp
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index d3b2bfe..43e02de 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 706edc8..78afa18 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;
}
More information about the Scummvm-git-logs
mailing list