SCI: Swapped x and y parameters of IsItSkip. Added IsItSkip to kernel table.

svn-id: r39894

2 files changed, 130 insertions, 130 deletions

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index c3619de48c..5eceb9d12b 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -861,8 +861,8 @@ reg_t kIsItSkip(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	int view = SKPV(0);
 	int loop = SKPV(1);
 	int cel = SKPV(2);
-	int x = UKPV(3);
-	int y = UKPV(4);
+	int y = UKPV(3);
+	int x = UKPV(4);
 	gfxr_view_t *res = NULL;
 	gfx_pixmap_t *pxm = NULL;
 
diff --git a/engines/sci/scicore/vocab_debug.cpp b/engines/sci/scicore/vocab_debug.cpp
index f3ed5d8793..c159a504a8 100644
--- a/engines/sci/scicore/vocab_debug.cpp
+++ b/engines/sci/scicore/vocab_debug.cpp
@@ -34,7 +34,7 @@ namespace Sci {
 #define SCI0_KNAMES_DEFAULT_ENTRIES_NR 0x72
 #define SCI1_KNAMES_DEFAULT_ENTRIES_NR 0x7E
 
-const char *sci0_default_knames[SCI0_KNAMES_DEFAULT_ENTRIES_NR] = {
+static const char *sci0_default_knames[SCI0_KNAMES_DEFAULT_ENTRIES_NR] = {
 	/*0x00*/ "Load",
 	/*0x01*/ "UnLoad",
 	/*0x02*/ "ScriptID",
@@ -151,133 +151,133 @@ const char *sci0_default_knames[SCI0_KNAMES_DEFAULT_ENTRIES_NR] = {
 	/*0x71*/ SCRIPT_UNKNOWN_FUNCTION_STRING
 };
 
-const char *sci1_default_knames[SCI1_KNAMES_DEFAULT_ENTRIES_NR] = {
-	"Load",
-	"UnLoad",
-	"ScriptID",
-	"DisposeScript",
-	"Clone",
-	"DisposeClone",
-	"IsObject",
-	"RespondsTo",
-	"DrawPic",
-	"Show",
-	"PicNotValid",
-	"Animate",
-	"SetNowSeen",
-	"NumLoops",
-	"NumCels",
-	"CelWide",
-	"CelHigh",
-	"DrawCel",
-	"AddToPic",
-	"NewWindow",
-	"GetPort",
-	"SetPort",
-	"DisposeWindow",
-	"DrawControl",
-	"HiliteControl",
-	"EditControl",
-	"TextSize",
-	"Display",
-	"GetEvent",
-	"GlobalToLocal",
-	"LocalToGlobal",
-	"MapKeyToDir",
-	"DrawMenuBar",
-	"MenuSelect",
-	"AddMenu",
-	"DrawStatus",
-	"Parse",
-	"Said",
-	"SetSynonyms",
-	"HaveMouse",
-	"SetCursor",
-	"SaveGame",
-	"RestoreGame",
-	"RestartGame",
-	"GameIsRestarting",
-	"DoSound",
-	"NewList",
-	"DisposeList",
-	"NewNode",
-	"FirstNode",
-	"LastNode",
-	"EmptyList",
-	"NextNode",
-	"PrevNode",
-	"NodeValue",
-	"AddAfter",
-	"AddToFront",
-	"AddToEnd",
-	"FindKey",
-	"DeleteKey",
-	"Random",
-	"Abs",
-	"Sqrt",
-	"GetAngle",
-	"GetDistance",
-	"Wait",
-	"GetTime",
-	"StrEnd",
-	"StrCat",
-	"StrCmp",
-	"StrLen",
-	"StrCpy",
-	"Format",
-	"GetFarText",
-	"ReadNumber",
-	"BaseSetter",
-	"DirLoop",
-	"CanBeHere",
-	"OnControl",
-	"InitBresen",
-	"DoBresen",
-	"DoAvoider",
-	"SetJump",
-	"SetDebug",
-	"InspectObj",
-	"ShowSends",
-	"ShowObjs",
-	"ShowFree",
-	"MemoryInfo",
-	"StackUsage",
-	"Profiler",
-	"GetMenu",
-	"SetMenu",
-	"GetSaveFiles",
-	"GetCWD",
-	"CheckFreeSpace",
-	"ValidPath",
-	"CoordPri",
-	"StrAt",
-	"DeviceInfo",
-	"GetSaveDir",
-	"CheckSaveGame",
-	"ShakeScreen",
-	"FlushResources",
-	"SinMult",
-	"CosMult",
-	"SinDiv",
-	"CosDiv",
-	"Graph",
-	"Joystick",
-	"ShiftScreen",
-	"Palette",
-	"MemorySegment",
-	"Intersections",
-	"Memory",
-	"ListOps",
-	"FileIO",
-	"DoAudio",
-	"DoSync",
-	"AvoidPath",
-	"Sort",
-	"ATan",
-	"Lock",         
-	"StrSplit",       
-	"GetMessage",
-	SCRIPT_UNKNOWN_FUNCTION_STRING
+static const char *sci1_default_knames[SCI1_KNAMES_DEFAULT_ENTRIES_NR] = {
+	/*0x00*/ "Load",
+	/*0x01*/ "UnLoad",
+	/*0x02*/ "ScriptID",
+	/*0x03*/ "DisposeScript",
+	/*0x04*/ "Clone",
+	/*0x05*/ "DisposeClone",
+	/*0x06*/ "IsObject",
+	/*0x07*/ "RespondsTo",
+	/*0x08*/ "DrawPic",
+	/*0x09*/ "Show",
+	/*0x0a*/ "PicNotValid",
+	/*0x0b*/ "Animate",
+	/*0x0c*/ "SetNowSeen",
+	/*0x0d*/ "NumLoops",
+	/*0x0e*/ "NumCels",
+	/*0x0f*/ "CelWide",
+	/*0x10*/ "CelHigh",
+	/*0x11*/ "DrawCel",
+	/*0x12*/ "AddToPic",
+	/*0x13*/ "NewWindow",
+	/*0x14*/ "GetPort",
+	/*0x15*/ "SetPort",
+	/*0x16*/ "DisposeWindow",
+	/*0x17*/ "DrawControl",
+	/*0x18*/ "HiliteControl",
+	/*0x19*/ "EditControl",
+	/*0x1a*/ "TextSize",
+	/*0x1b*/ "Display",
+	/*0x1c*/ "GetEvent",
+	/*0x1d*/ "GlobalToLocal",
+	/*0x1e*/ "LocalToGlobal",
+	/*0x1f*/ "MapKeyToDir",
+	/*0x20*/ "DrawMenuBar",
+	/*0x21*/ "MenuSelect",
+	/*0x22*/ "AddMenu",
+	/*0x23*/ "DrawStatus",
+	/*0x24*/ "Parse",
+	/*0x25*/ "Said",
+	/*0x26*/ "SetSynonyms",
+	/*0x27*/ "HaveMouse",
+	/*0x28*/ "SetCursor",
+	/*0x29*/ "SaveGame",
+	/*0x2a*/ "RestoreGame",
+	/*0x2b*/ "RestartGame",
+	/*0x2c*/ "GameIsRestarting",
+	/*0x2d*/ "DoSound",
+	/*0x2e*/ "NewList",
+	/*0x2f*/ "DisposeList",
+	/*0x30*/ "NewNode",
+	/*0x31*/ "FirstNode",
+	/*0x32*/ "LastNode",
+	/*0x33*/ "EmptyList",
+	/*0x34*/ "NextNode",
+	/*0x35*/ "PrevNode",
+	/*0x36*/ "NodeValue",
+	/*0x37*/ "AddAfter",
+	/*0x38*/ "AddToFront",
+	/*0x39*/ "AddToEnd",
+	/*0x3a*/ "FindKey",
+	/*0x3b*/ "DeleteKey",
+	/*0x3c*/ "Random",
+	/*0x3d*/ "Abs",
+	/*0x3e*/ "Sqrt",
+	/*0x3f*/ "GetAngle",
+	/*0x40*/ "GetDistance",
+	/*0x41*/ "Wait",
+	/*0x42*/ "GetTime",
+	/*0x43*/ "StrEnd",
+	/*0x44*/ "StrCat",
+	/*0x45*/ "StrCmp",
+	/*0x46*/ "StrLen",
+	/*0x47*/ "StrCpy",
+	/*0x48*/ "Format",
+	/*0x49*/ "GetFarText",
+	/*0x4a*/ "ReadNumber",
+	/*0x4b*/ "BaseSetter",
+	/*0x4c*/ "DirLoop",
+	/*0x4d*/ "CanBeHere",
+	/*0x4e*/ "OnControl",
+	/*0x4f*/ "InitBresen",
+	/*0x50*/ "DoBresen",
+	/*0x51*/ "DoAvoider",
+	/*0x52*/ "SetJump",
+	/*0x53*/ "SetDebug",
+	/*0x54*/ "InspectObj",
+	/*0x55*/ "ShowSends",
+	/*0x56*/ "ShowObjs",
+	/*0x57*/ "ShowFree",
+	/*0x58*/ "MemoryInfo",
+	/*0x59*/ "StackUsage",
+	/*0x5a*/ "Profiler",
+	/*0x5b*/ "GetMenu",
+	/*0x5c*/ "SetMenu",
+	/*0x5d*/ "GetSaveFiles",
+	/*0x5e*/ "GetCWD",
+	/*0x5f*/ "CheckFreeSpace",
+	/*0x60*/ "ValidPath",
+	/*0x61*/ "CoordPri",
+	/*0x62*/ "StrAt",
+	/*0x63*/ "DeviceInfo",
+	/*0x64*/ "GetSaveDir",
+	/*0x65*/ "CheckSaveGame",
+	/*0x66*/ "ShakeScreen",
+	/*0x67*/ "FlushResources",
+	/*0x68*/ "SinMult",
+	/*0x69*/ "CosMult",
+	/*0x6a*/ "SinDiv",
+	/*0x6b*/ "CosDiv",
+	/*0x6c*/ "Graph",
+	/*0x6d*/ "Joystick",
+	/*0x6e*/ "ShiftScreen",
+	/*0x6f*/ "Palette",
+	/*0x70*/ "MemorySegment",
+	/*0x71*/ "Intersections",
+	/*0x72*/ "Memory",
+	/*0x73*/ "ListOps",
+	/*0x74*/ "FileIO",
+	/*0x75*/ "DoAudio",
+	/*0x76*/ "DoSync",
+	/*0x77*/ "AvoidPath",
+	/*0x78*/ "Sort",
+	/*0x79*/ "ATan",
+	/*0x7a*/ "Lock",         
+	/*0x7b*/ "StrSplit",       
+	/*0x7c*/ "GetMessage",
+	/*0x7d*/ "IsItSkip"
 };
 
 int getInt(unsigned char* d) {