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

[csnover]

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:
fe7ae6087a SCI: Remove warning in kDisposeScript


Commit: fe7ae6087ad2b6773488d4a29849865d7fd70712
    https://github.com/scummvm/scummvm/commit/fe7ae6087ad2b6773488d4a29849865d7fd70712
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-05-28T11:42:17-05:00

Commit Message:
SCI: Remove warning in kDisposeScript

The two-argument implementation is correct and works properly.

Changed paths:
    engines/sci/engine/kscripts.cpp



diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index 303de07..6fd130b 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -260,9 +260,6 @@ reg_t kDisposeScript(EngineState *s, int argc, reg_t *argv) {
 	if (argc != 2) {
 		return s->r_acc;
 	} else {
-		// This exists in the KQ5CD and GK1 interpreter. We know it is used
-		// when GK1 starts up, before the Sierra logo.
-		warning("kDisposeScript called with 2 parameters, still untested");
 		return argv[1];
 	}
 }