From 22929379e5a3184f0cbcc8d5ac18b9175d31267c Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 7 Jan 2017 14:48:49 +0100 Subject: DIRECTOR: Lingo: Documented catmember differences for D3 --- engines/director/lingo/lingo-builtins.cpp | 11 +++++++++++ engines/director/lingo/lingo-the.cpp | 6 +++++- engines/director/lingo/lingo-the.h | 1 + engines/director/lingo/lingo.h | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp index 9220b14f09..62e0236f3f 100644 --- a/engines/director/lingo/lingo-builtins.cpp +++ b/engines/director/lingo/lingo-builtins.cpp @@ -127,6 +127,9 @@ static struct BuiltinProto { { "return", Lingo::b_return, 0, 0, false }, // D2 { "tab", Lingo::b_tab, 0, 0, false }, // D2 { "true", Lingo::b_true, 0, 0, false }, // D2 + // References + { "field", Lingo::b_field, 1, 1, false }, // D3 + { 0, 0, 0, 0, false } }; @@ -820,4 +823,12 @@ void Lingo::factoryCall(Common::String &name, int nargs) { } } +/////////////////// +// References +/////////////////// +void Lingo::b_field(int nargs) { + warning("STUB: b_field"); +} + + } // End of namespace Director diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp index 270746678b..89d8746b0d 100644 --- a/engines/director/lingo/lingo-the.cpp +++ b/engines/director/lingo/lingo-the.cpp @@ -31,7 +31,8 @@ class Sprite; TheEntity entities[] = { { kTheBeepOn, "beepOn", false }, // D2 property { kTheButtonStyle, "buttonStyle", false }, // D2 p - { kTheCast, "cast", true }, + { kTheCast, "cast", true }, // D3 + { kTheCastMembers, "castmembers", true }, // D3 { kTheCenterStage, "centerStage", false }, // D2 p { kTheCheckBoxAccess, "checkBoxAccess", false }, // D2 p { kTheCheckBoxType, "checkBoxType", false }, // D2 p @@ -139,6 +140,9 @@ TheEntityField fields[] = { { kTheSprite, "volume", kTheVolume }, { kTheSprite, "width", kTheWidth }, // D2 p + // the number of castmembers + { kTheCastMembers, "number", kTheNumber }, // D3 p + // Common cast fields { kTheCast, "castType", kTheCastType }, { kTheCast, "filename", kTheFilename }, diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h index f68a81d363..4f09f677fa 100644 --- a/engines/director/lingo/lingo-the.h +++ b/engines/director/lingo/lingo-the.h @@ -43,6 +43,7 @@ enum TheEntityType { kTheSprite, kTheCast, + kTheCastMembers, kThePerFrameHook, kTheTicks, kTheTimer, diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h index 931ac7b6da..1484b9a3b7 100644 --- a/engines/director/lingo/lingo.h +++ b/engines/director/lingo/lingo.h @@ -387,6 +387,8 @@ public: static void b_factory(int nargs); void factoryCall(Common::String &name, int nargs); + static void b_field(int nargs); + void func_mci(Common::String &s); void func_mciwait(Common::String &s); void func_goto(Datum &frame, Datum &movie); -- cgit v1.2.3