[Scummvm-git-logs] scummvm master -> f192831c86e603370cc92e9ac846605db9e5fa5f
sev-
sev at scummvm.org
Mon Feb 6 22:51:53 CET 2017
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c22b78eae6 DIRECTOR: Lingo: Documented D4 "Digital video" Lingo
57af996b4d DIRECTOR: Lingo: Documented D4 "Event handlers and messages" Lingo
56abfed990 DIRECTOR: Lingo: Documented D4 "Events" Lingo
4c64ebe027 DIRECTOR: Lingo: Documented D4 "External to Director" Lingo
f192831c86 DIRECTOR: Lingo: Documented D4 "Lists" Lingo
Commit: c22b78eae61eea2eac9cd5b357ea9cd0c3c02226
https://github.com/scummvm/scummvm/commit/c22b78eae61eea2eac9cd5b357ea9cd0c3c02226
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-06T21:42:12+01:00
Commit Message:
DIRECTOR: Lingo: Documented D4 "Digital video" Lingo
Changed paths:
engines/director/lingo/lingo-builtins.cpp
engines/director/lingo/lingo-the.cpp
engines/director/lingo/lingo-the.h
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 630d681..123ce8c 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -196,6 +196,7 @@ static const char *twoWordBuiltins[] = {
static const char *builtinFunctions[] = {
"cast",
"field",
+ "findEmpty",
0
};
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index d606b76..8658e64 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -91,6 +91,8 @@ TheEntity entities[] = {
{ kThePauseState, "pauseState", false }, // D2 f
{ kThePerFrameHook, "perFrameHook", false }, // D2 p
{ kThePreloadEventAbort,"preloadEventAbort",false },
+ { kThePreLoadRAM, "preLoadRAM", false }, // D4 p
+ { kTheQuickTimePresent, "quickTimePresent", false }, // D4 f
{ kTheResult, "result", false }, // D2 f
{ kTheRightMouseDown, "rightMouseDown", false },
{ kTheRightMouseUp, "rightMouseUp", false },
@@ -145,20 +147,20 @@ TheEntityField fields[] = {
{ kTheSprite, "locH", kTheLocH }, // D2 p
{ kTheSprite, "locV", kTheLocV }, // D2 p
{ kTheSprite, "moveable", kTheMoveable },
- { kTheSprite, "movieRate", kTheMovieRate },
- { kTheSprite, "movieTime", kTheMovieTime },
+ { kTheSprite, "movieRate", kTheMovieRate }, // D4 P
+ { kTheSprite, "movieTime", kTheMovieTime }, // D4 P
{ kTheSprite, "pattern", kThePattern }, // D2 p
{ kTheSprite, "puppet", kThePuppet }, // D2 p
{ kTheSprite, "right", kTheRight }, // D2 p
{ kTheSprite, "scriptNum", kTheScriptNum }, // D4 p
- { kTheSprite, "startTime", kTheStartTime },
+ { kTheSprite, "startTime", kTheStartTime }, // D4 p
{ kTheSprite, "stretch", kTheStrech }, // D2 p
- { kTheSprite, "stopTime", kTheStopTime },
+ { kTheSprite, "stopTime", kTheStopTime }, // D4 p
{ kTheSprite, "top", kTheTop }, // D2 p
{ kTheSprite, "trails", kTheTrails },
{ kTheSprite, "type", kTheType }, // D2 p
{ kTheSprite, "visible", kTheVisible },
- { kTheSprite, "volume", kTheVolume },
+ { kTheSprite, "volume", kTheVolume }, // D4 p
{ kTheSprite, "width", kTheWidth }, // D2 p
// Common cast fields
@@ -179,13 +181,17 @@ TheEntityField fields[] = {
{ kTheCast, "foreColor", kTheForeColor },
// Digital video fields
- { kTheCast, "controller", kTheController },
- { kTheCast, "directToStage",kTheDirectToStage },
- { kTheCast, "frameRate", kTheFrameRate },
- { kTheCast, "loop", kTheLoop },
- { kTheCast, "pausedAtStart",kThePausedAtStart },
- { kTheCast, "preload", kThePreload },
- { kTheCast, "sound", kTheSound }, // 0-1 off-on
+ { kTheCast, "center", kTheCenter }, // D4 p
+ { kTheCast, "controller", kTheController }, // D4 p
+ { kTheCast, "crop", kTheCrop }, // D4 p
+ { kTheCast, "directToStage",kTheDirectToStage },// D4 p
+ { kTheCast, "duration", kTheDuration }, // D4 p
+ { kTheCast, "frameRate", kTheFrameRate }, // D4 p
+ { kTheCast, "loop", kTheLoop }, // D4 p
+ { kTheCast, "pausedAtStart",kThePausedAtStart },// D4 p
+ { kTheCast, "preLoad", kThePreLoad }, // D4 p
+ { kTheCast, "sound", kTheSound }, // D4 p // 0-1 off-on
+ { kTheCast, "video", kTheVideo }, // D4 p
// Bitmap fields
{ kTheCast, "depth", kTheDepth },
diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h
index be501ba..08522b4 100644
--- a/engines/director/lingo/lingo-the.h
+++ b/engines/director/lingo/lingo-the.h
@@ -89,6 +89,8 @@ enum TheEntityType {
kThePauseState,
kThePerFrameHook,
kThePreloadEventAbort,
+ kThePreLoadRAM,
+ kTheQuickTimePresent,
kTheResult,
kTheRightMouseDown,
kTheRightMouseUp,
@@ -130,12 +132,15 @@ enum TheFieldType {
kTheAbbr = 1,
kTheCastNum,
kTheCastType,
+ kTheCenter,
kTheCheckMark,
kTheController,
+ kTheCrop,
kTheCursor,
kTheDepth,
kTheDirectToStage,
kTheDrawRect,
+ kTheDuration,
kTheLocH,
kTheLocV,
kTheBackColor,
@@ -166,7 +171,7 @@ enum TheFieldType {
kThePattern,
kThePausedAtStart,
kThePicture,
- kThePreload,
+ kThePreLoad,
kThePuppet,
kThePurgePriority,
kTheRect,
@@ -192,6 +197,7 @@ enum TheFieldType {
kTheTop,
kTheTrails,
kTheType,
+ kTheVideo,
kTheVisible,
kTheVolume,
kTheWidth
Commit: 57af996b4d6f4cdb468a683568cdae9056e2e6f8
https://github.com/scummvm/scummvm/commit/57af996b4d6f4cdb468a683568cdae9056e2e6f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-06T22:01:07+01:00
Commit Message:
DIRECTOR: Lingo: Documented D4 "Event handlers and messages" Lingo
Changed paths:
engines/director/lingo/lingo-builtins.cpp
engines/director/lingo/lingo-the.cpp
engines/director/lingo/lingo-the.h
engines/director/lingo/lingo.cpp
engines/director/lingo/lingo.h
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 123ce8c..521b440 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -126,6 +126,7 @@ static struct BuiltinProto {
{ "cursor", Lingo::b_cursor, 1, 1, false }, // D2
{ "framesToHMS", Lingo::b_framesToHMS, 4, 4, false }, // D3
{ "HMStoFrames", Lingo::b_HMStoFrames, 4, 4, false }, // D3
+ { "param", Lingo::b_param, 1, 1, true }, // D4 f
{ "printFrom", Lingo::b_printFrom, -1,0, false }, // D2
// put // D2
// set // D2
@@ -771,6 +772,12 @@ void Lingo::b_HMStoFrames(int nargs) {
g_lingo->push(Datum(0));
}
+void Lingo::b_param(int nargs) {
+ g_lingo->printSTUBWithArglist("b_param", nargs);
+
+ g_lingo->dropStack(nargs);
+}
+
void Lingo::b_printFrom(int nargs) {
g_lingo->printSTUBWithArglist("b_printFrom", nargs);
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 8658e64..8bf2303 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -87,6 +87,7 @@ TheEntity entities[] = {
{ kTheMovie, "movie", false }, // D2 f
{ kTheMultiSound, "multiSound", false },
{ kTheOptionDown, "optionDown", false }, // D2 f
+ { kTheParamCount, "paramCount", false }, // D4 f
{ kThePathName, "pathName", false }, // D2 f
{ kThePauseState, "pauseState", false }, // D2 f
{ kThePerFrameHook, "perFrameHook", false }, // D2 p
diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h
index 08522b4..ae0c0ed 100644
--- a/engines/director/lingo/lingo-the.h
+++ b/engines/director/lingo/lingo-the.h
@@ -85,6 +85,7 @@ enum TheEntityType {
kTheMovie,
kTheMultiSound,
kTheOptionDown,
+ kTheParamCount,
kThePathName,
kThePauseState,
kThePerFrameHook,
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 4a9b612..a6d3ad8 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -36,18 +36,19 @@ struct EventHandlerType {
const char *name;
} static const eventHandlerDescs[] = {
{ kEventPrepareMovie, "prepareMovie" },
- { kEventStartMovie, "startMovie" },
- { kEventStopMovie, "stopMovie" },
+ { kEventStartMovie, "startMovie" }, // D3?
+ { kEventStepMovie, "stepMovie" }, // D3?
+ { kEventStopMovie, "stopMovie" }, // D3?
{ kEventNew, "newSprite" },
{ kEventBeginSprite, "beginSprite" },
{ kEventEndSprite, "endSprite" },
- { kEventEnterFrame, "enterFrame" },
+ { kEventEnterFrame, "enterFrame" }, // D4
{ kEventPrepareFrame, "prepareFrame" },
{ kEventIdle, "idle" },
{ kEventStepFrame, "stepFrame"},
- { kEventExitFrame, "exitFrame" },
+ { kEventExitFrame, "exitFrame" }, // D4
{ kEventActivateWindow, "activateWindow" },
{ kEventDeactivateWindow, "deactivateWindow" },
@@ -57,10 +58,10 @@ struct EventHandlerType {
{ kEventCloseWindow, "closeWindow" },
{ kEventStart, "start" },
- { kEventKeyUp, "keyUp" },
- { kEventKeyDown, "keyDown" }, // D2 as when
- { kEventMouseUp, "mouseUp" }, // D2 as when
- { kEventMouseDown, "mouseDown" }, // D2 as when
+ { kEventKeyUp, "keyUp" }, // D4
+ { kEventKeyDown, "keyDown" }, // D2 as when D4
+ { kEventMouseUp, "mouseUp" }, // D2 w D3?
+ { kEventMouseDown, "mouseDown" }, // D2 w D3?
{ kEventRightMouseDown, "rightMouseDown" },
{ kEventRightMouseUp, "rightMouseUp" },
{ kEventMouseEnter, "mouseEnter" },
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index b327853..41d423b 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -36,6 +36,7 @@ namespace Director {
enum LEvent {
kEventPrepareMovie,
kEventStartMovie,
+ kEventStepMovie,
kEventStopMovie,
kEventNew,
@@ -375,6 +376,7 @@ public:
static void b_cursor(int nargs);
static void b_framesToHMS(int nargs);
static void b_HMStoFrames(int nargs);
+ static void b_param(int nargs);
static void b_printFrom(int nargs);
static void b_showGlobals(int nargs);
static void b_showLocals(int nargs);
Commit: 56abfed990e038421580ffb0c7de02468f5a0d11
https://github.com/scummvm/scummvm/commit/56abfed990e038421580ffb0c7de02468f5a0d11
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-06T22:08:27+01:00
Commit Message:
DIRECTOR: Lingo: Documented D4 "Events" Lingo
Changed paths:
engines/director/lingo/lingo-builtins.cpp
engines/director/lingo/lingo-the.cpp
engines/director/lingo/lingo-the.h
engines/director/lingo/lingo.cpp
engines/director/lingo/lingo.h
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 521b440..4f1136b 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -100,6 +100,7 @@ static struct BuiltinProto {
{ "do", Lingo::b_do, 1, 1, false }, // D2
{ "halt", Lingo::b_halt, 0, 0, false }, // D4
{ "nothing", Lingo::b_nothing, 0, 0, false }, // D2
+ { "pass", Lingo::b_pass, 0, 0, false }, // D4
{ "pause", Lingo::b_pause, 0, 0, false }, // D2
// play // D2
{ "playAccel", Lingo::b_playAccel, -1,0, false }, // D2
@@ -732,6 +733,12 @@ void Lingo::b_halt(int nargs) {
warning("Movie halted");
}
+void Lingo::b_pass(int nargs) {
+ g_lingo->printSTUBWithArglist("b_pass", nargs);
+
+ g_lingo->dropStack(nargs);
+}
+
void Lingo::b_pause(int nargs) {
g_director->_playbackPaused = true;
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 8bf2303..f31cc96 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -60,6 +60,7 @@ TheEntity entities[] = {
{ kTheKey, "key", false }, // D2 f
{ kTheKeyCode, "keyCode", false }, // D2 f
{ kTheKeyDownScript, "keyDownScript", false }, // D2 p
+ { kTheKeyUpScript, "keyUpScript", false }, // D4 p
{ kTheLabelList, "labelList", false }, // D3 f
{ kTheLastClick, "lastClick", false }, // D2 f
{ kTheLastEvent, "lastEvent", false }, // D2 f
diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h
index ae0c0ed..eaecd3e 100644
--- a/engines/director/lingo/lingo-the.h
+++ b/engines/director/lingo/lingo-the.h
@@ -58,6 +58,7 @@ enum TheEntityType {
kTheKey,
kTheKeyCode,
kTheKeyDownScript,
+ kTheKeyUpScript,
kTheLabelList,
kTheLastClick,
kTheLastEvent,
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index a6d3ad8..f7eafda 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -59,7 +59,7 @@ struct EventHandlerType {
{ kEventStart, "start" },
{ kEventKeyUp, "keyUp" }, // D4
- { kEventKeyDown, "keyDown" }, // D2 as when D4
+ { kEventKeyDown, "keyDown" }, // D2 w D4 (as when from D2)
{ kEventMouseUp, "mouseUp" }, // D2 w D3?
{ kEventMouseDown, "mouseDown" }, // D2 w D3?
{ kEventRightMouseDown, "rightMouseDown" },
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 41d423b..f25bf33 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -414,6 +414,7 @@ public:
static void b_do(int nargs);
static void b_halt(int nargs);
static void b_nothing(int nargs);
+ static void b_pass(int nargs);
static void b_pause(int nargs);
static void b_playAccel(int nargs);
static void b_preLoad(int nargs);
Commit: 4c64ebe027dde35da615705ace7239ba7e9c09a5
https://github.com/scummvm/scummvm/commit/4c64ebe027dde35da615705ace7239ba7e9c09a5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-06T22:31:58+01:00
Commit Message:
DIRECTOR: Lingo: Documented D4 "External to Director" Lingo
Changed paths:
engines/director/lingo/lingo-builtins.cpp
engines/director/lingo/lingo-the.cpp
engines/director/lingo/lingo-the.h
engines/director/lingo/lingo.h
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 4f1136b..5ef7486 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -84,10 +84,12 @@ static struct BuiltinProto {
{ "closeDA", Lingo::b_closeDA, 0, 0, false }, // D2
{ "closeResFile", Lingo::b_closeResFile, 0, 1, false }, // D2
{ "closeXlib", Lingo::b_closeXlib, 0, 1, false }, // D2
+ { "getNthFileNameInFolder",Lingo::b_getNthFileNameInFolder,2,2,true },//D4
// open // D2
{ "openDA", Lingo::b_openDA, 1, 1, false }, // D2
{ "openResFile", Lingo::b_openResFile, 1, 1, false }, // D2
{ "openXlib", Lingo::b_openXlib, 1, 1, false }, // D2
+ { "saveMovie", Lingo::b_saveMovie, 1, 1, false }, // D4
{ "setCallBack", Lingo::b_setCallBack, 2, 2, false }, // D3
{ "showResFile", Lingo::b_showResFile, 0, 1, false }, // D2
{ "showXlib", Lingo::b_showXlib, 0, 1, false }, // D2
@@ -136,6 +138,7 @@ static struct BuiltinProto {
// Score
{ "constrainH", Lingo::b_constrainH, 2, 2, true }, // D2
{ "constrainV", Lingo::b_constrainV, 2, 2, true }, // D2
+ { "copyToClipBoard",Lingo::b_copyToClipBoard,1,1, false }, // D4
{ "duplicate", Lingo::b_duplicate, 1, 2, false }, // D4
{ "editableText", Lingo::b_editableText, 0, 0, false }, // D2
{ "erase", Lingo::b_erase, 1, 1, false }, // D4
@@ -199,6 +202,8 @@ static const char *builtinFunctions[] = {
"cast",
"field",
"findEmpty",
+ "getNthFileNameInFolder",
+ "xFactoryList",
0
};
@@ -632,6 +637,14 @@ void Lingo::b_closeXlib(int nargs) {
delete d.u.s;
}
+void Lingo::b_getNthFileNameInFolder(int nargs) {
+ g_lingo->printSTUBWithArglist("b_getNthFileNameInFolder", nargs);
+
+ g_lingo->dropStack(nargs);
+
+ g_lingo->push(Datum(0));
+}
+
void Lingo::b_openDA(int nargs) {
Datum d = g_lingo->pop();
@@ -662,6 +675,12 @@ void Lingo::b_openXlib(int nargs) {
delete d.u.s;
}
+void Lingo::b_saveMovie(int nargs) {
+ g_lingo->printSTUBWithArglist("b_saveMovie", nargs);
+
+ g_lingo->dropStack(nargs);
+}
+
void Lingo::b_setCallBack(int nargs) {
warning("STUB: b_setCallBack");
}
@@ -919,6 +938,12 @@ void Lingo::b_constrainV(int nargs) {
g_lingo->push(Datum(0));
}
+void Lingo::b_copyToClipBoard(int nargs) {
+ g_lingo->printSTUBWithArglist("b_copyToClipBoard", nargs);
+
+ g_lingo->dropStack(nargs);
+}
+
void Lingo::b_duplicate(int nargs) {
g_lingo->printSTUBWithArglist("b_duplicate", nargs);
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index f31cc96..1f07520 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -86,6 +86,10 @@ TheEntity entities[] = {
{ kTheMouseV, "mouseV", false }, // D2 f
{ kTheMouseWord, "mouseWord", false }, // D3 f
{ kTheMovie, "movie", false }, // D2 f
+ { kTheMovieFileFreeSize,"movieFileFreeSize",false }, // D4 f
+ { kTheMovieFileSize, "movieFileSize", false }, // D4 f
+ { kTheMovieName, "movieName", false }, // D4 f
+ { kTheMoviePath, "moviePath", false }, // D4 f
{ kTheMultiSound, "multiSound", false },
{ kTheOptionDown, "optionDown", false }, // D2 f
{ kTheParamCount, "paramCount", false }, // D4 f
@@ -99,6 +103,8 @@ TheEntity entities[] = {
{ kTheRightMouseDown, "rightMouseDown", false },
{ kTheRightMouseUp, "rightMouseUp", false },
{ kTheRomanLingo, "romanLingo", false },
+ { kTheSearchCurrentFolder,"searchCurrentFolder",false },// D4 f
+ { kTheSearchPath, "searchPath", false }, // D4 f
{ kTheSelection, "selection", false }, // D2 f
{ kTheSelEnd, "selEnd", false }, // D2 p
{ kTheSelStart, "selStart", false }, // D2 p
@@ -127,6 +133,7 @@ TheEntity entities[] = {
{ kTheTrace, "trace", false }, // D4 p
{ kTheTraceLoad, "traceLoad", false }, // D4 p
{ kTheTraceLogFile, "traceLogFile", false }, // D4 p
+ { kTheUpdateMovieEnabled,"updateMovieEnabled",false }, // D4 p
{ kTheWindow, "window", false },
{ kTheWords, "words", false }, // D3
{ kTheNOEntity, NULL, false }
diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h
index eaecd3e..a269d7b 100644
--- a/engines/director/lingo/lingo-the.h
+++ b/engines/director/lingo/lingo-the.h
@@ -84,6 +84,10 @@ enum TheEntityType {
kTheMouseV,
kTheMouseWord,
kTheMovie,
+ kTheMovieFileFreeSize,
+ kTheMovieFileSize,
+ kTheMovieName,
+ kTheMoviePath,
kTheMultiSound,
kTheOptionDown,
kTheParamCount,
@@ -97,6 +101,8 @@ enum TheEntityType {
kTheRightMouseDown,
kTheRightMouseUp,
kTheRomanLingo,
+ kTheSearchCurrentFolder,
+ kTheSearchPath,
kTheSelection,
kTheSelEnd,
kTheSelStart,
@@ -125,6 +131,7 @@ enum TheEntityType {
kTheTrace,
kTheTraceLoad,
kTheTraceLogFile,
+ kTheUpdateMovieEnabled,
kTheWindow,
kTheWords
};
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index f25bf33..31cd004 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -384,6 +384,7 @@ public:
static void b_constrainH(int nargs);
static void b_constrainV(int nargs);
+ static void b_copyToClipBoard(int nargs);
static void b_duplicate(int nargs);
static void b_editableText(int nargs);
static void b_erase(int nargs);
@@ -427,10 +428,12 @@ public:
static void b_closeDA(int nargs);
static void b_closeResFile(int nargs);
static void b_closeXlib(int nargs);
+ static void b_getNthFileNameInFolder(int nargs);
static void b_openDA(int nargs);
static void b_openResFile(int nargs);
static void b_openXlib(int nargs);
static void b_setCallBack(int nargs);
+ static void b_saveMovie(int nargs);
static void b_showResFile(int nargs);
static void b_showXlib(int nargs);
static void b_xFactoryList(int nargs);
Commit: f192831c86e603370cc92e9ac846605db9e5fa5f
https://github.com/scummvm/scummvm/commit/f192831c86e603370cc92e9ac846605db9e5fa5f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-06T22:51:25+01:00
Commit Message:
DIRECTOR: Lingo: Documented D4 "Lists" Lingo
Changed paths:
engines/director/lingo/lingo-builtins.cpp
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 5ef7486..adcd276 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -56,53 +56,53 @@ static struct BuiltinProto {
{ "string", Lingo::b_string, 1, 1, true }, // D2
{ "value", Lingo::b_value, 1, 1, true }, // D2
// Lists
- { "add", Lingo::b_add, 2, 2, false }, // D4
- { "addAt", Lingo::b_addAt, 3, 3, false }, // D4
- { "addProp", Lingo::b_addProp, 3, 3, false }, // D4
- { "append", Lingo::b_append, 2, 2, false }, // D4
- { "count", Lingo::b_count, 1, 1, true }, // D4
- { "deleteAt", Lingo::b_deleteAt, 2, 2, false }, // D4
- { "deleteProp", Lingo::b_deleteProp, 2, 2, false }, // D4
- { "findPos", Lingo::b_findPos, 2, 2, true }, // D4
- { "findPosNear", Lingo::b_findPosNear, 2, 2, true }, // D4
- { "getaProp", Lingo::b_getaProp, 2, 2, true }, // D4
- { "getAt", Lingo::b_getAt, 2, 2, true }, // D4
- { "getLast", Lingo::b_getLast, 1, 1, true }, // D4
- { "getOne", Lingo::b_getOne, 2, 2, true }, // D4
- { "getPos", Lingo::b_getPos, 2, 2, true }, // D4
- { "getProp", Lingo::b_getProp, 2, 2, true }, // D4
- { "getPropAt", Lingo::b_getPropAt, 2, 2, true }, // D4
- { "list", Lingo::b_list, -1, 0, true }, // D4
- { "listP", Lingo::b_listP, 1, 1, true }, // D4
- { "max", Lingo::b_max, 1, 1, true }, // D4
- { "min", Lingo::b_min, 1, 1, true }, // D4
- { "setaProp", Lingo::b_setaProp, 3, 3, false }, // D4
- { "setAt", Lingo::b_setAt, 3, 3, false }, // D4
- { "setProp", Lingo::b_setProp, 3, 3, false }, // D4
- { "sort", Lingo::b_sort, 1, 1, false }, // D4
+ { "add", Lingo::b_add, 2, 2, false }, // D4 c
+ { "addAt", Lingo::b_addAt, 3, 3, false }, // D4 c
+ { "addProp", Lingo::b_addProp, 3, 3, false }, // D4 c
+ { "append", Lingo::b_append, 2, 2, false }, // D4 c
+ { "count", Lingo::b_count, 1, 1, true }, // D4 f
+ { "deleteAt", Lingo::b_deleteAt, 2, 2, false }, // D4 c
+ { "deleteProp", Lingo::b_deleteProp, 2, 2, false }, // D4 c
+ { "findPos", Lingo::b_findPos, 2, 2, true }, // D4 f
+ { "findPosNear", Lingo::b_findPosNear, 2, 2, true }, // D4 f
+ { "getaProp", Lingo::b_getaProp, 2, 2, true }, // D4 f
+ { "getAt", Lingo::b_getAt, 2, 2, true }, // D4 f
+ { "getLast", Lingo::b_getLast, 1, 1, true }, // D4 f
+ { "getOne", Lingo::b_getOne, 2, 2, true }, // D4 f
+ { "getPos", Lingo::b_getPos, 2, 2, true }, // D4 f
+ { "getProp", Lingo::b_getProp, 2, 2, true }, // D4 f
+ { "getPropAt", Lingo::b_getPropAt, 2, 2, true }, // D4 f
+ { "list", Lingo::b_list, -1, 0, true }, // D4 f
+ { "listP", Lingo::b_listP, 1, 1, true }, // D4 f
+ { "max", Lingo::b_max, 1, 1, true }, // D4 f
+ { "min", Lingo::b_min, 1, 1, true }, // D4 f
+ { "setaProp", Lingo::b_setaProp, 3, 3, false }, // D4 c
+ { "setAt", Lingo::b_setAt, 3, 3, false }, // D4 c
+ { "setProp", Lingo::b_setProp, 3, 3, false }, // D4 c
+ { "sort", Lingo::b_sort, 1, 1, false }, // D4 c
// Files
- { "closeDA", Lingo::b_closeDA, 0, 0, false }, // D2
- { "closeResFile", Lingo::b_closeResFile, 0, 1, false }, // D2
- { "closeXlib", Lingo::b_closeXlib, 0, 1, false }, // D2
- { "getNthFileNameInFolder",Lingo::b_getNthFileNameInFolder,2,2,true },//D4
- // open // D2
- { "openDA", Lingo::b_openDA, 1, 1, false }, // D2
- { "openResFile", Lingo::b_openResFile, 1, 1, false }, // D2
- { "openXlib", Lingo::b_openXlib, 1, 1, false }, // D2
- { "saveMovie", Lingo::b_saveMovie, 1, 1, false }, // D4
- { "setCallBack", Lingo::b_setCallBack, 2, 2, false }, // D3
- { "showResFile", Lingo::b_showResFile, 0, 1, false }, // D2
- { "showXlib", Lingo::b_showXlib, 0, 1, false }, // D2
- { "xFactoryList", Lingo::b_xFactoryList, 1, 1, true }, // D3
+ { "closeDA", Lingo::b_closeDA, 0, 0, false }, // D2 c
+ { "closeResFile", Lingo::b_closeResFile, 0, 1, false }, // D2 c
+ { "closeXlib", Lingo::b_closeXlib, 0, 1, false }, // D2 c
+ { "getNthFileNameInFolder",Lingo::b_getNthFileNameInFolder,2,2,true },//D4 f
+ // open // D2 c
+ { "openDA", Lingo::b_openDA, 1, 1, false }, // D2 c
+ { "openResFile", Lingo::b_openResFile, 1, 1, false }, // D2 c
+ { "openXlib", Lingo::b_openXlib, 1, 1, false }, // D2 c
+ { "saveMovie", Lingo::b_saveMovie, 1, 1, false }, // D4 c
+ { "setCallBack", Lingo::b_setCallBack, 2, 2, false }, // D3 c
+ { "showResFile", Lingo::b_showResFile, 0, 1, false }, // D2 c
+ { "showXlib", Lingo::b_showXlib, 0, 1, false }, // D2 c
+ { "xFactoryList", Lingo::b_xFactoryList, 1, 1, true }, // D3 f
// Control
- { "abort", Lingo::b_abort, 0, 0, false }, // D4
+ { "abort", Lingo::b_abort, 0, 0, false }, // D4 c
{ "continue", Lingo::b_continue, 0, 0, false }, // D2
- { "dontPassEvent", Lingo::b_dontPassEvent, 0, 0, false }, // D2
+ { "dontPassEvent", Lingo::b_dontPassEvent, 0, 0, false }, // D2 c
{ "delay", Lingo::b_delay, 1, 1, false }, // D2
{ "do", Lingo::b_do, 1, 1, false }, // D2
- { "halt", Lingo::b_halt, 0, 0, false }, // D4
- { "nothing", Lingo::b_nothing, 0, 0, false }, // D2
- { "pass", Lingo::b_pass, 0, 0, false }, // D4
+ { "halt", Lingo::b_halt, 0, 0, false }, // D4 c
+ { "nothing", Lingo::b_nothing, 0, 0, false }, // D2 c
+ { "pass", Lingo::b_pass, 0, 0, false }, // D4 c
{ "pause", Lingo::b_pause, 0, 0, false }, // D2
// play // D2
{ "playAccel", Lingo::b_playAccel, -1,0, false }, // D2
@@ -119,13 +119,13 @@ static struct BuiltinProto {
// when timeOut // D2
// Types
{ "floatP", Lingo::b_floatP, 1, 1, true }, // D3
- { "ilk", Lingo::b_ilk, 1, 2, false }, // D4
+ { "ilk", Lingo::b_ilk, 1, 2, false }, // D4 f
{ "integerp", Lingo::b_integerp, 1, 1, true }, // D2
{ "objectp", Lingo::b_objectp, 1, 1, true }, // D2
{ "stringp", Lingo::b_stringp, 1, 1, true }, // D2
{ "symbolp", Lingo::b_symbolp, 1, 1, true }, // D2
// Misc
- { "alert", Lingo::b_alert, 1, 1, false }, // D2
+ { "alert", Lingo::b_alert, 1, 1, false }, // D2 c
{ "cursor", Lingo::b_cursor, 1, 1, false }, // D2
{ "framesToHMS", Lingo::b_framesToHMS, 4, 4, false }, // D3
{ "HMStoFrames", Lingo::b_HMStoFrames, 4, 4, false }, // D3
@@ -138,19 +138,19 @@ static struct BuiltinProto {
// Score
{ "constrainH", Lingo::b_constrainH, 2, 2, true }, // D2
{ "constrainV", Lingo::b_constrainV, 2, 2, true }, // D2
- { "copyToClipBoard",Lingo::b_copyToClipBoard,1,1, false }, // D4
- { "duplicate", Lingo::b_duplicate, 1, 2, false }, // D4
+ { "copyToClipBoard",Lingo::b_copyToClipBoard,1,1, false }, // D4 c
+ { "duplicate", Lingo::b_duplicate, 1, 2, false }, // D4 c
{ "editableText", Lingo::b_editableText, 0, 0, false }, // D2
- { "erase", Lingo::b_erase, 1, 1, false }, // D4
- { "findEmpty", Lingo::b_findEmpty, 1, 1, true }, // D4
+ { "erase", Lingo::b_erase, 1, 1, false }, // D4 c
+ { "findEmpty", Lingo::b_findEmpty, 1, 1, true }, // D4 f
// go // D2
- { "importFileInto", Lingo::b_importFileInto,2, 2, false }, // D4
+ { "importFileInto", Lingo::b_importFileInto,2, 2, false }, // D4 c
{ "installMenu", Lingo::b_installMenu, 1, 1, false }, // D2
{ "label", Lingo::b_label, 1, 1, true }, // D2
{ "marker", Lingo::b_marker, 1, 1, true }, // D2
- { "move", Lingo::b_move, 1, 2, false }, // D4
+ { "move", Lingo::b_move, 1, 2, false }, // D4 c
{ "moveableSprite", Lingo::b_moveableSprite,0, 0, false }, // D2
- { "pasteClipBoardInto",Lingo::b_pasteClipBoardInto,1, 1, false }, // D4
+ { "pasteClipBoardInto",Lingo::b_pasteClipBoardInto,1, 1, false }, // D4 c
{ "puppetPalette", Lingo::b_puppetPalette, -1,0, false }, // D2
{ "puppetSound", Lingo::b_puppetSound, -1,0, false }, // D2
{ "puppetSprite", Lingo::b_puppetSprite, -1,0, false }, // D2
@@ -158,8 +158,8 @@ static struct BuiltinProto {
{ "puppetTransition",Lingo::b_puppetTransition,-1,0, false },// D2
{ "rollOver", Lingo::b_rollOver, 1, 1, true }, // D2
{ "spriteBox", Lingo::b_spriteBox, -1,0, false }, // D2
- { "unLoad", Lingo::b_unLoad, 0, 2, false }, // D4
- { "unLoadCast", Lingo::b_unLoadCast, 0, 2, false }, // D4
+ { "unLoad", Lingo::b_unLoad, 0, 2, false }, // D4 c
+ { "unLoadCast", Lingo::b_unLoadCast, 0, 2, false }, // D4 c
{ "updateStage", Lingo::b_updateStage, 0, 0, false }, // D2
{ "zoomBox", Lingo::b_zoomBox, -1,0, false }, // D2
// Point
@@ -170,7 +170,7 @@ static struct BuiltinProto {
{ "mciwait", Lingo::b_mciwait, 1, 1, false },
{ "sound-fadeIn", Lingo::b_soundFadeIn, 1, 2, false }, // D3
{ "sound-fadeOut", Lingo::b_soundFadeOut, 1, 2, false }, // D3
- { "sound-playFile", Lingo::b_soundPlayFile, 2, 2, false }, // D3
+ { "sound-playFile", Lingo::b_soundPlayFile, 2, 2, false }, // D3 c
{ "sound-stop", Lingo::b_soundStop, 1, 1, false }, // D3
{ "soundBusy", Lingo::b_soundBusy, 1, 1, true }, // D3
// Constants
@@ -184,8 +184,8 @@ static struct BuiltinProto {
{ "true", Lingo::b_true, 0, 0, false }, // D2
{ "version", Lingo::b_version, 0, 0, false }, // D3
// References
- { "cast", Lingo::b_cast, 1, 1, false }, // D4
- { "field", Lingo::b_field, 1, 1, false }, // D3
+ { "cast", Lingo::b_cast, 1, 1, false }, // D4 f
+ { "field", Lingo::b_field, 1, 1, false }, // D3 f
{ "me", Lingo::b_me, -1,0, false }, // D3
{ 0, 0, 0, 0, false }
@@ -200,9 +200,24 @@ static const char *twoWordBuiltins[] = {
static const char *builtinFunctions[] = {
"cast",
+ "count",
"field",
"findEmpty",
+ "findPos",
+ "findPosNear",
+ "getaProp",
+ "getAt",
+ "getLast",
"getNthFileNameInFolder",
+ "getOne",
+ "getPos",
+ "getProp",
+ "getPropAt",
+ "ilk",
+ "list",
+ "listP",
+ "max",
+ "min",
"xFactoryList",
0
};
More information about the Scummvm-git-logs
mailing list