[Scummvm-git-logs] scummvm master -> 9ce1d470be335677fd0c2078e19cf699c3d53534

[rvanlaar]

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:
9ce1d470be DIRECTOR: LINGO: Director version cleanups


Commit: 9ce1d470be335677fd0c2078e19cf699c3d53534
    https://github.com/scummvm/scummvm/commit/9ce1d470be335677fd0c2078e19cf699c3d53534
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-02-29T21:48:38+01:00

Commit Message:
DIRECTOR: LINGO: Director version cleanups

Changed paths:
    engines/director/lingo/lingo-builtins.cpp
    engines/director/lingo/lingo-code.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 41e2fd8899..75a8be1e02 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -62,15 +62,15 @@ static struct BuiltinProto {
 	// String
 	{ "chars",			LB::b_chars,		3, 3, true, 2, FBLTIN },	// D2 f
 	{ "charToNum",		LB::b_charToNum,	1, 1, true, 2, FBLTIN },	// D2 f
-	{ "delete",			LB::b_delete,		1, 1, true, 3, BLTIN },	//		D3 c
-	{ "hilite",			LB::b_hilite,		1, 1, true, 3, BLTIN },	//		D3 c
+	{ "delete",			LB::b_delete,		1, 1, true, 3, BLTIN },		//		D3 command
+	{ "hilite",			LB::b_hilite,		1, 1, true, 3, BLTIN },		//		D3 c
 	{ "length",			LB::b_length,		1, 1, true, 2, FBLTIN },	// D2 f
 	{ "numToChar",		LB::b_numToChar,	1, 1, true, 2, FBLTIN },	// D2 f
 	{ "offset",			LB::b_offset,		2, 3, true, 2, FBLTIN },	// D2 f
 	{ "string",			LB::b_string,		1, 1, true, 2, FBLTIN },	// D2 f
 	{ "value",		 	LB::b_value,		1, 1, true, 2, FBLTIN },	// D2 f
 	// Lists
-	{ "add",			LB::b_add,			2, 2, false, 4, BLTIN },	//			D4 command
+	{ "add",			LB::b_add,			2, 2, false, 4, BLTIN },	//			D4 c
 	{ "addAt",			LB::b_addAt,		3, 3, false, 4, BLTIN },	//			D4 c
 	{ "addProp",		LB::b_addProp,		3, 3, false, 4, BLTIN },	//			D4 c
 	{ "append",			LB::b_append,		2, 2, false, 4, BLTIN },	//			D4 c
@@ -99,7 +99,7 @@ static struct BuiltinProto {
 	{ "closeResFile",	LB::b_closeResFile,	0, 1, false, 2, BLTIN },	// D2 c
 	{ "closeXlib",		LB::b_closeXlib,	0, 1, false, 2, BLTIN },	// D2 c
 	{ "getNthFileNameInFolder",LB::b_getNthFileNameInFolder,2,2,true,4,FBLTIN },//	D4 f
-		// open																// D2 c
+		// open															// D2 c
 	{ "openDA",	 		LB::b_openDA, 		1, 1, false, 2, BLTIN },	// D2 c
 	{ "openResFile",	LB::b_openResFile,	1, 1, false, 2, BLTIN },	// D2 c
 	{ "openXlib",		LB::b_openXlib,		1, 1, false, 2, BLTIN },	// D2 c
@@ -119,20 +119,20 @@ static struct BuiltinProto {
 	{ "nothing",		LB::b_nothing,		0, 0, false, 2, BLTIN },	// D2 c
 	{ "pass",			LB::b_pass,			0, 0, false, 4, BLTIN },	//			D4 c
 	{ "pause",			LB::b_pause,		0, 0, false, 2, BLTIN },	// D2 c
-		// play																// D2 c
+		// play															// D2 c
 	{ "playAccel",		LB::b_playAccel,	-1,0, false, 2, BLTIN },	// D2
-		// play done														// D2
+		// play done													// D2
 	{ "preLoad",		LB::b_preLoad,		-1,0, false, 3, BLTIN },	//		D3.1 c
 	{ "preLoadCast",	LB::b_preLoadCast,	-1,0, false, 3, BLTIN },	//		D3.1 c
 	{ "quit",			LB::b_quit,			0, 0, false, 2, BLTIN },	// D2 c
 	{ "restart",		LB::b_restart,		0, 0, false, 2, BLTIN },	// D2 c
-	{ "return",			LB::b_return,		0, 1, false, 2, BLTIN },	// D2 function
+	{ "return",			LB::b_return,		0, 1, false, 2, BLTIN },	// D2 f
 	{ "shutDown",		LB::b_shutDown,		0, 0, false, 2, BLTIN },	// D2 c
 	{ "startTimer",		LB::b_startTimer,	0, 0, false, 2, BLTIN },	// D2 c
-		// when keyDown														// D2
-		// when mouseDown													// D2
-		// when mouseUp														// D2
-		// when timeOut														// D2
+		// when keyDown													// D2
+		// when mouseDown												// D2
+		// when mouseUp													// D2
+		// when timeOut													// D2
 	// Types
 	{ "factory",		LB::b_factoryP,		1, 1, true,  3, FBLTIN },	//		D3
 	{ "floatP",			LB::b_floatP,		1, 1, true,  3, FBLTIN },	//		D3
@@ -152,8 +152,8 @@ static struct BuiltinProto {
 	{ "HMStoFrames",	LB::b_HMStoFrames,	4, 4, false, 3, FBLTIN },	//		D3 f
 	{ "param",	 		LB::b_param,		1, 1, true,  4, FBLTIN },	//			D4 f
 	{ "printFrom",	 	LB::b_printFrom,	-1,0, false, 2, BLTIN },	// D2 c
-		// put																// D2
-		// set																// D2
+		// put															// D2
+		// set															// D2
 	{ "showGlobals",	LB::b_showGlobals,	0, 0, false, 2, BLTIN },	// D2 c
 	{ "showLocals",		LB::b_showLocals,	0, 0, false, 2, BLTIN },	// D2 c
 	// Score
@@ -164,7 +164,7 @@ static struct BuiltinProto {
 	{ "editableText",	LB::b_editableText,	0, 0, false, 2, BLTIN },	// D2, FIXME: the field in D4+
 	{ "erase",			LB::b_erase,		1, 1, false, 4, BLTIN },	//			D4 c
 	{ "findEmpty",		LB::b_findEmpty,	1, 1, true,  4, FBLTIN },	//			D4 f
-		// go														// D2
+		// go															// D2
 	{ "importFileInto",	LB::b_importFileInto,2, 2, false, 4, BLTIN },	//			D4 c
 	{ "installMenu",	LB::b_installMenu,	1, 1, false, 2, BLTIN },	// D2 c
 	{ "label",			LB::b_label,		1, 1, true,  2, FBLTIN },	// D2 f
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 58dd67dd68..a1dd9b3b1b 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -87,7 +87,7 @@ static struct FuncDescr {
 	{ LC::c_gt,				"c_gt",				"" },
 	{ LC::c_hilite,			"c_hilite",			"" },
 	{ LC::c_ifcode,			"c_ifcode",			"oooi" },
-	{ LC::c_instance,		"c_instance",		"s" },
+	{ LC::c_instance,		"c_instance",		"s" },	// D2
 	{ LC::c_intersects,		"c_intersects",		"" },
 	{ LC::c_intpush,		"c_intpush",		"i" },
 	{ LC::c_itemOf,			"c_itemOf",			"" },	// D3