[Scummvm-cvs-logs] scummvm master -> d03ab8b716f588b1558427be3d269af2425ffc10

[wjp]

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:
d03ab8b716 SCI32: Revert GK1 hacks


Commit: d03ab8b716f588b1558427be3d269af2425ffc10
    https://github.com/scummvm/scummvm/commit/d03ab8b716f588b1558427be3d269af2425ffc10
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-03-01T11:32:02+01:00

Commit Message:
SCI32: Revert GK1 hacks

Replacing a valid signature error by a warning isn't useful.

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 43e02de..d3b2bfe 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 2be47b8..5810a59 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;
 }