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

[bluegr]

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:
f2e80ffc7f SCI: Do not map SetScroll twice


Commit: f2e80ffc7f4fcbfa0920af34a232aa6153aa1f88
    https://github.com/scummvm/scummvm/commit/f2e80ffc7f4fcbfa0920af34a232aa6153aa1f88
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-01-15T21:34:42+02:00

Commit Message:
SCI: Do not map SetScroll twice

Changed paths:
    engines/sci/engine/kernel_tables.h



diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index 7be85fc..fce3230 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -627,11 +627,6 @@ static SciKernelMapEntry s_kernelMap[] = {
 	{ MAP_DUMMY(InputText),        SIG_EVERYWHERE,           "(.*)",                  NULL,            NULL },
 	{ MAP_DUMMY(TextWidth),        SIG_EVERYWHERE,           "(.*)",                  NULL,            NULL },
 	{ MAP_DUMMY(PointSize),        SIG_EVERYWHERE,           "(.*)",                  NULL,            NULL },
-	// SetScroll is called by script 64909, Styler::doit(), but it doesn't seem to
-	// be used at all (plus, it was then changed to a dummy function in SCI3).
-	// Since this is most likely unused, and we got no test case, error out when
-	// it is called in order to find an actual call to it.
-	{ MAP_DUMMY(SetScroll),        SIG_EVERYWHERE,           "(.*)",                  NULL,            NULL },
 
 	// SCI2.1 Kernel Functions
 	{ MAP_CALL(CD),                SIG_EVERYWHERE,           "(.*)",                  NULL,            NULL },