[Scummvm-git-logs] scummvm master -> ab88597a4ae653756010ca1758a7080968f0ad81

[csnover]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fb129116cd SCI32: Stub kGraph
84978b7cab SCI32: Fix crash when trying to interrogate bartender in GK1
ab88597a4a SCI32: Make kNumCels error more detailed


Commit: fb129116cd8011cb54dd434c4998553ca6555cc7
    https://github.com/scummvm/scummvm/commit/fb129116cd8011cb54dd434c4998553ca6555cc7
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-01T15:26:34-05:00

Commit Message:
SCI32: Stub kGraph

This kernel call exists only in SCI2 and is a null subroutine. It
is called at the beginning of GK1.

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 d616bfe..6b31569 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -248,7 +248,7 @@ static const SciKernelMapSubEntry kDoAudio_subops[] = {
 
 //    version,         subId, function-mapping,                    signature,              workarounds
 static const SciKernelMapSubEntry kGraph_subops[] = {
-	{ SIG_SCI32,           1, MAP_CALL(StubNull),                  "",                     NULL }, // called by gk1 sci32 right at the start
+	// 1 - load bits
 	{ SIG_SCIALL,          2, MAP_CALL(GraphGetColorCount),        "",                     NULL },
 	// 3 - set palette via resource
 	{ SIG_SCIALL,          4, MAP_CALL(GraphDrawLine),             "iiiii(i)(i)",          kGraphDrawLine_workarounds },
@@ -698,7 +698,10 @@ static SciKernelMapEntry s_kernelMap[] = {
 #ifdef ENABLE_SCI32
 	{ "GlobalToLocal", kGlobalToLocal32, SIG_SCI32, SIGFOR_ALL, "oo",                 NULL,            NULL },
 #endif
-	{ MAP_CALL(Graph),             SIG_EVERYWHERE,           NULL,                    kGraph_subops,   NULL },
+	{ MAP_CALL(Graph),             SIG_SCI16, SIGFOR_ALL,    NULL,                    kGraph_subops,   NULL },
+#ifdef ENABLE_SCI32
+	{ MAP_EMPTY(Graph),            SIG_SCI32, SIGFOR_ALL,    "(.*)",                  NULL,            NULL },
+#endif
 	{ MAP_CALL(HaveMouse),         SIG_EVERYWHERE,           "",                      NULL,            NULL },
 	{ MAP_CALL(HiliteControl),     SIG_EVERYWHERE,           "o",                     NULL,            NULL },
 	{ MAP_CALL(InitBresen),        SIG_EVERYWHERE,           "o(i)",                  NULL,            NULL },


Commit: 84978b7caba7e85af13613de216de61e06ed4e7a
    https://github.com/scummvm/scummvm/commit/84978b7caba7e85af13613de216de61e06ed4e7a
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-01T15:26:34-05:00

Commit Message:
SCI32: Fix crash when trying to interrogate bartender in GK1

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



diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 8012b5b..362f87a 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -684,6 +684,7 @@ const SciWorkaroundEntry kNewWindow_workarounds[] = {
 
 //    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kNumCels_workarounds[] = {
+	{ GID_GK1,           460, 64998, -1,              "GKEgo", "lastCel",                   NULL,    -1, { WORKAROUND_FAKE, 5 } }, // when Gabriel clicks "ask" on the bartender from a distance
 	{ GID_GK1,           808, 64998, -1,          "sDJEnters", "changeState",               NULL,    -1, { WORKAROUND_FAKE, 6 } }, //
 	{ GID_GK2,           470, 64998, -1,        "pLookieLoos", "lastCel",                   NULL,    -1, { WORKAROUND_FAKE, 50 } }, // random background movement in the crime scene in Munich city centre
 	{ GID_GK2,           470, 64998, -1,          "pNewsCrew", "lastCel",                   NULL,    -1, { WORKAROUND_FAKE, 18 } }, // random background movement in the crime scene in Munich city centre


Commit: ab88597a4ae653756010ca1758a7080968f0ad81
    https://github.com/scummvm/scummvm/commit/ab88597a4ae653756010ca1758a7080968f0ad81
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-01T15:26:34-05:00

Commit Message:
SCI32: Make kNumCels error more detailed

Changed paths:
    engines/sci/graphics/celobj32.cpp



diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index 7514052..f538bf6 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -824,7 +824,7 @@ int16 CelObjView::getNumCels(const GuiResourceId viewId, const int16 loopNo) {
 		SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, kNumCels_workarounds, &origin);
 		switch (solution.type) {
 		case WORKAROUND_NONE:
-			error("[CelObjView::getNumCels]: loop number is equal to loop count in %s", origin.toString().c_str());
+			error("[CelObjView::getNumCels]: loop number %d is equal to loop count in view %u, %s", loopNo, viewId, origin.toString().c_str());
 		case WORKAROUND_FAKE:
 			return (int16)solution.value;
 		case WORKAROUND_IGNORE: