diff options
Diffstat (limited to 'engines/director')
| -rw-r--r-- | engines/director/lingo/lingo-builtins.cpp | 10 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-the.cpp | 15 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-the.h | 3 |
3 files changed, 16 insertions, 12 deletions
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp index 6228380a52..f714bc9856 100644 --- a/engines/director/lingo/lingo-builtins.cpp +++ b/engines/director/lingo/lingo-builtins.cpp @@ -138,8 +138,8 @@ static struct BuiltinProto { { "showGlobals", Lingo::b_showGlobals, 0, 0, false }, // D2 { "showLocals", Lingo::b_showLocals, 0, 0, false }, // D2 // Score - { "constrainH", Lingo::b_constrainH, 2, 2, true }, // D2 - { "constrainV", Lingo::b_constrainV, 2, 2, true }, // D2 + { "constrainH", Lingo::b_constrainH, 2, 2, true }, // D2 f + { "constrainV", Lingo::b_constrainV, 2, 2, true }, // D2 f { "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 @@ -160,11 +160,11 @@ static struct BuiltinProto { { "puppetTransition",Lingo::b_puppetTransition,-1,0, false },// D2 c { "ramNeeded", Lingo::b_ramNeeded, 2, 2, true }, // D4 f { "rollOver", Lingo::b_rollOver, 1, 1, true }, // D2 f - { "spriteBox", Lingo::b_spriteBox, -1,0, false }, // D2 + { "spriteBox", Lingo::b_spriteBox, -1,0, false }, // D2 c { "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 c - { "zoomBox", Lingo::b_zoomBox, -1,0, false }, // D2 + { "zoomBox", Lingo::b_zoomBox, -1,0, false }, // D2 c // Point { "point", Lingo::b_point, 2, 2, true }, // D4 f { "inside", Lingo::b_inside, 2, 2, true }, // D4 f @@ -222,6 +222,8 @@ static const char *builtinFunctions[] = { "backspace", "birth", "cast", + "constrainH", + "constrainV", "cos", "count", "empty", diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp index 5997f5bb3e..b6b97980fd 100644 --- a/engines/director/lingo/lingo-the.cpp +++ b/engines/director/lingo/lingo-the.cpp @@ -147,12 +147,12 @@ TheEntity entities[] = { TheEntityField fields[] = { { kTheSprite, "backColor", kTheBackColor }, // D2 p - { kTheSprite, "blend", kTheBlend }, + { kTheSprite, "blend", kTheBlend }, // D4 p { kTheSprite, "bottom", kTheBottom }, // D2 p { kTheSprite, "castNum", kTheCastNum }, // D2 p { kTheSprite, "constraint", kTheConstraint }, // D2 p { kTheSprite, "cursor", kTheCursor }, // D2 p - { kTheSprite, "editableText", kTheEditableText }, + { kTheSprite, "editableText", kTheEditableText }, // D4 p { kTheSprite, "foreColor", kTheForeColor }, // D2 p { kTheSprite, "height", kTheHeight }, // D2 p { kTheSprite, "immediate", kTheImmediate }, // D2 p @@ -161,20 +161,21 @@ TheEntityField fields[] = { { kTheSprite, "lineSize", kTheLineSize }, // D2 p { kTheSprite, "locH", kTheLocH }, // D2 p { kTheSprite, "locV", kTheLocV }, // D2 p - { kTheSprite, "moveable", kTheMoveable }, + { kTheSprite, "moveableSprite",kTheMoveableSprite },// D4 p { 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, "scoreColor", kTheScoreColor }, // D4 p { kTheSprite, "scriptNum", kTheScriptNum }, // D4 p { kTheSprite, "startTime", kTheStartTime }, // D4 p { kTheSprite, "stretch", kTheStrech }, // D2 p { kTheSprite, "stopTime", kTheStopTime }, // D4 p { kTheSprite, "top", kTheTop }, // D2 p - { kTheSprite, "trails", kTheTrails }, + { kTheSprite, "trails", kTheTrails }, // D4 p { kTheSprite, "type", kTheType }, // D2 p - { kTheSprite, "visible", kTheVisible }, + { kTheSprite, "visible", kTheVisible }, // D4 p { kTheSprite, "volume", kTheVolume }, // D4 p { kTheSprite, "width", kTheWidth }, // D2 p @@ -356,7 +357,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) { case kTheConstraint: sprite->_constraint = d.u.i; break; - case kTheMoveable: + case kTheMoveableSprite: sprite->_moveable = d.u.i; break; case kTheBackColor: @@ -557,7 +558,7 @@ Datum Lingo::getTheSprite(Datum &id1, int field) { case kTheConstraint: d.u.i = sprite->_constraint; break; - case kTheMoveable: + case kTheMoveableSprite: d.u.i = sprite->_moveable; break; case kTheBackColor: diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h index 368b4a29ce..512443abd7 100644 --- a/engines/director/lingo/lingo-the.h +++ b/engines/director/lingo/lingo-the.h @@ -178,7 +178,7 @@ enum TheFieldType { kTheLoop, kTheModal, kTheModified, - kTheMoveable, + kTheMoveableSprite, kTheMovieRate, kTheMovieTime, kTheName, @@ -193,6 +193,7 @@ enum TheFieldType { kTheRect, kTheRegPoint, kTheRight, + kTheScoreColor, kTheScript, kTheScriptNum, kTheScriptText, |