diff options
| -rw-r--r-- | engines/director/lingo/lingo-builtins.cpp | 14 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-the.cpp | 32 |
2 files changed, 23 insertions, 23 deletions
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp index 861dc0a2d3..b7c32dd05e 100644 --- a/engines/director/lingo/lingo-builtins.cpp +++ b/engines/director/lingo/lingo-builtins.cpp @@ -146,7 +146,7 @@ static struct BuiltinProto { // Misc { "alert", LB::b_alert, 1, 1, false, 2, BLTIN }, // D2 c { "birth", LB::b_birth, -1,0, false, 4, FBLTIN }, // D4 f - { "clearGlobals", LB::b_clearGlobals, 0, 0, false, 4, BLTIN }, // D4 c + { "clearGlobals", LB::b_clearGlobals, 0, 0, false, 3, BLTIN }, // D3.1 c { "cursor", LB::b_cursor, 1, 1, false, 2, BLTIN }, // D2 c { "framesToHMS", LB::b_framesToHMS, 4, 4, false, 3, FBLTIN }, // D3 f { "HMStoFrames", LB::b_HMStoFrames, 4, 4, false, 3, FBLTIN }, // D3 f @@ -161,7 +161,7 @@ static struct BuiltinProto { { "constrainV", LB::b_constrainV, 2, 2, true, 2, FBLTIN }, // D2 f { "copyToClipBoard",LB::b_copyToClipBoard,1,1, false, 4, BLTIN }, // D4 c { "duplicate", LB::b_duplicate, 1, 2, false, 4, BLTIN }, // D4 c - { "editableText", LB::b_editableText, 0, 0, false, 2, BLTIN }, // D2 + { "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 @@ -170,18 +170,18 @@ static struct BuiltinProto { { "label", LB::b_label, 1, 1, true, 2, FBLTIN }, // D2 f { "marker", LB::b_marker, 1, 1, true, 2, FBLTIN }, // D2 f { "move", LB::b_move, 1, 2, false, 4, BLTIN }, // D4 c - { "moveableSprite", LB::b_moveableSprite,0, 0, false, 2, BLTIN }, // D2 + { "moveableSprite", LB::b_moveableSprite,0, 0, false, 2, BLTIN }, // D2, FIXME: the field in D4+ { "pasteClipBoardInto",LB::b_pasteClipBoardInto,1,1,false,4,BLTIN },// D4 c { "puppetPalette", LB::b_puppetPalette, -1,0, false, 2, BLTIN }, // D2 c { "puppetSound", LB::b_puppetSound, -1,0, false, 2, BLTIN }, // D2 c { "puppetSprite", LB::b_puppetSprite, -1,0, false, 2, BLTIN }, // D2 c { "puppetTempo", LB::b_puppetTempo, 1, 1, false, 2, BLTIN }, // D2 c { "puppetTransition",LB::b_puppetTransition,-1,0,false,2, BLTIN }, // D2 c - { "ramNeeded", LB::b_ramNeeded, 2, 2, true, 4, FBLTIN }, // D4 f + { "ramNeeded", LB::b_ramNeeded, 2, 2, true, 3, FBLTIN }, // D3.1 f { "rollOver", LB::b_rollOver, 1, 1, true, 2, FBLTIN }, // D2 f { "spriteBox", LB::b_spriteBox, -1,0, false, 2, BLTIN }, // D2 c - { "unLoad", LB::b_unLoad, 0, 2, false, 4, BLTIN }, // D4 c - { "unLoadCast", LB::b_unLoadCast, 0, 2, false, 4, BLTIN }, // D4 c + { "unLoad", LB::b_unLoad, 0, 2, false, 3, BLTIN }, // D3.1 c + { "unLoadCast", LB::b_unLoadCast, 0, 2, false, 3, BLTIN }, // D3.1 c { "updateStage", LB::b_updateStage, 0, 0, false, 2, BLTIN }, // D2 c { "zoomBox", LB::b_zoomBox, -1,0, false, 2, BLTIN }, // D2 c // Point @@ -193,7 +193,7 @@ static struct BuiltinProto { { "union", LB::b_union, 2, 2, true, 4, FBLTIN }, // D4 f // Sound { "beep", LB::b_beep, 0, 1, false, 2, BLTIN }, // D2 - { "mci", LB::b_mci, 1, 1, false, 4, BLTIN }, // D4 c + { "mci", LB::b_mci, 1, 1, false, 3, BLTIN }, // D3.1 c { "mciwait", LB::b_mciwait, 1, 1, false, 4, BLTIN }, // D4 c { "sound-close", LB::b_soundClose, 1, 1, false, 4, BLTIN }, // D4 c { "sound-fadeIn", LB::b_soundFadeIn, 1, 2, false, 3, BLTIN }, // D3 c diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp index 4531109076..97d8687626 100644 --- a/engines/director/lingo/lingo-the.cpp +++ b/engines/director/lingo/lingo-the.cpp @@ -78,7 +78,7 @@ TheEntity entities[] = { { kTheLastRoll, "lastRoll", false, 2 }, // D2 f { kTheLines, "lines", false, 3 }, // D3 { kTheMachineType, "machineType", false, 2 }, // D2 f - { kTheMaxInteger, "maxInteger", false, 4 }, // D4 f + { kTheMaxInteger, "maxInteger", false, 3 }, // D3.1 f { kTheMemorySize, "memorySize", false, 2 }, // D2 f { kTheMenu, "menu", true, 3 }, // D3 p { kTheMenus, "menus", false, 3 }, // D3 p @@ -100,7 +100,7 @@ TheEntity entities[] = { { kTheMovieFileSize, "movieFileSize", false, 4 }, // D4 f { kTheMovieName, "movieName", false, 4 }, // D4 f { kTheMoviePath, "moviePath", false, 4 }, // D4 f - { kTheMultiSound, "multiSound", false, 4 }, // D4 p + { kTheMultiSound, "multiSound", false, 3 }, // D3.1 f { kTheOptionDown, "optionDown", false, 2 }, // D2 f { kTheParamCount, "paramCount", false, 4 }, // D4 f { kThePathName, "pathName", false, 2 }, // D2 f @@ -108,12 +108,12 @@ TheEntity entities[] = { { kThePerFrameHook, "perFrameHook", false, 2 }, // D2 p { kThePreloadEventAbort,"preloadEventAbort",false, 4 }, // D4 p { kThePreLoadRAM, "preLoadRAM", false, 4 }, // D4 p - { kTheQuickTimePresent, "quickTimePresent", false, 4 }, // D4 f + { kTheQuickTimePresent, "quickTimePresent", false, 3 }, // D3.1 f { kTheRandomSeed, "randomSeed", false, 4 }, // D4 p { kTheResult, "result", false, 2 }, // D2 f { kTheRightMouseDown, "rightMouseDown", false, 5 }, // D5 f { kTheRightMouseUp, "rightMouseUp", false, 5 }, // D5 f - { kTheRomanLingo, "romanLingo", false, 4 }, // D4 p + { kTheRomanLingo, "romanLingo", false, 3 }, // D3.1 p { kTheSearchCurrentFolder,"searchCurrentFolder",false,4 },// D4 f { kTheSearchPath, "searchPath", false, 4 }, // D4 f { kTheSelection, "selection", false, 2 }, // D2 f @@ -168,21 +168,17 @@ TheEntityField fields[] = { { kTheSprite, "locH", kTheLocH, 2 },// D2 p { kTheSprite, "locV", kTheLocV, 2 },// D2 p { kTheSprite, "moveableSprite",kTheMoveableSprite,4 },// D4 p - { kTheSprite, "movieRate", kTheMovieRate, 4 },// D4 P - { kTheSprite, "movieTime", kTheMovieTime, 4 },// D4 P { kTheSprite, "pattern", kThePattern, 2 },// D2 p { kTheSprite, "puppet", kThePuppet, 2 },// D2 p { kTheSprite, "right", kTheRight, 2 },// D2 p { kTheSprite, "scoreColor", kTheScoreColor, 4 },// D4 p { kTheSprite, "scriptNum", kTheScriptNum, 4 },// D4 p - { kTheSprite, "startTime", kTheStartTime, 4 },// D4 p { kTheSprite, "stretch", kTheStrech, 2 },// D2 p - { kTheSprite, "stopTime", kTheStopTime, 4 },// D4 p { kTheSprite, "top", kTheTop, 2 },// D2 p - { kTheSprite, "trails", kTheTrails, 4 },// D4 p + { kTheSprite, "trails", kTheTrails, 3 },// D3.1 p { kTheSprite, "type", kTheType, 2 },// D2 p { kTheSprite, "visible", kTheVisible, 4 },// D4 p - { kTheSprite, "volume", kTheVolume, 4 },// D4 p + { kTheSprite, "volume", kTheVolume, 3 },// D3.1 p { kTheSprite, "width", kTheWidth, 2 },// D2 p // Common cast fields @@ -204,15 +200,19 @@ TheEntityField fields[] = { // Digital video fields { kTheCast, "center", kTheCenter, 4 },// D4 p - { kTheCast, "controller", kTheController, 4 },// D4 p + { kTheCast, "controller", kTheController, 3 },// D3.1 p { kTheCast, "crop", kTheCrop, 4 },// D4 p - { kTheCast, "directToStage",kTheDirectToStage,4 },// D4 p - { kTheCast, "duration", kTheDuration, 4 },// D4 p + { kTheCast, "directToStage",kTheDirectToStage,3 },// D3.1 p + { kTheCast, "duration", kTheDuration, 3 },// D3.1 p { kTheCast, "frameRate", kTheFrameRate, 4 },// D4 p - { kTheCast, "loop", kTheLoop, 4 },// D4 p + { kTheCast, "loop", kTheLoop, 3 },// D3.1 p + { kTheSprite, "movieRate", kTheMovieRate, 3 },// D3.1 P + { kTheSprite, "movieTime", kTheMovieTime, 3 },// D3.1 P { kTheCast, "pausedAtStart",kThePausedAtStart,4 },// D4 p - { kTheCast, "preLoad", kThePreLoad, 4 },// D4 p - { kTheCast, "sound", kTheSound, 4 },// D4 p // 0-1 off-on + { kTheCast, "preLoad", kThePreLoad, 3 },// D3.1 p + { kTheCast, "sound", kTheSound, 3 },// D3.1 p // 0-1 off-on + { kTheSprite, "startTime", kTheStartTime, 3 },// D3.1 p + { kTheSprite, "stopTime", kTheStopTime, 3 },// D3.1 p { kTheCast, "video", kTheVideo, 4 },// D4 p // Bitmap fields |