diff options
author | Eugene Sandulenko | 2017-01-07 17:31:19 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2017-01-07 17:31:19 +0100 |
commit | 8e303c77052bdd691d67855c0103e23b69ade3bb (patch) | |
tree | 8694499d8fbdb35c37842da2dee4a67340dccacf /engines/director | |
parent | e3a7fe4caba7f4d8d46cfaf2d2e1c8dfb0e4316c (diff) | |
download | scummvm-rg350-8e303c77052bdd691d67855c0103e23b69ade3bb.tar.gz scummvm-rg350-8e303c77052bdd691d67855c0103e23b69ade3bb.tar.bz2 scummvm-rg350-8e303c77052bdd691d67855c0103e23b69ade3bb.zip |
DIRECTOR: Lingo: Added stub for 'me' keyword
Diffstat (limited to 'engines/director')
-rw-r--r-- | engines/director/lingo/lingo-builtins.cpp | 27 | ||||
-rw-r--r-- | engines/director/lingo/lingo-the.cpp | 4 | ||||
-rw-r--r-- | engines/director/lingo/lingo.h | 1 |
3 files changed, 19 insertions, 13 deletions
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp index 62e0236f3f..5715ff2fcb 100644 --- a/engines/director/lingo/lingo-builtins.cpp +++ b/engines/director/lingo/lingo-builtins.cpp @@ -33,19 +33,19 @@ static struct BuiltinProto { } builtins[] = { // Math { "abs", Lingo::b_abs, 1, 1, true }, // D2 - { "atan", Lingo::b_atan, 1, 1, true }, // D4 - { "cos", Lingo::b_cos, 1, 1, true }, // D4 - { "exp", Lingo::b_exp, 1, 1, true }, // D4 - { "float", Lingo::b_float, 1, 1, true }, // D4 + { "atan", Lingo::b_atan, 1, 1, true }, // D4 + { "cos", Lingo::b_cos, 1, 1, true }, // D4 + { "exp", Lingo::b_exp, 1, 1, true }, // D4 + { "float", Lingo::b_float, 1, 1, true }, // D4 { "integer", Lingo::b_integer, 1, 1, true }, { "integerp", Lingo::b_integerp, 1, 1, true }, - { "log", Lingo::b_log, 1, 1, true }, // D4 - { "pi", Lingo::b_pi, 0, 0, true }, // D4 - { "power", Lingo::b_power, 2, 2, true }, // D4 + { "log", Lingo::b_log, 1, 1, true }, // D4 + { "pi", Lingo::b_pi, 0, 0, true }, // D4 + { "power", Lingo::b_power, 2, 2, true }, // D4 { "random", Lingo::b_random, 1, 1, true }, // D2 { "sin", Lingo::b_sin, 1, 1, true }, { "sqrt", Lingo::b_sqrt, 1, 1, true }, // D2 - { "tan", Lingo::b_tan, 1, 1, true }, // D4 + { "tan", Lingo::b_tan, 1, 1, true }, // D4 // String { "chars", Lingo::b_chars, 3, 3, true }, // D2 { "charToNum", Lingo::b_charToNum, 1, 1, true }, // D2 @@ -87,7 +87,7 @@ static struct BuiltinProto { { "alert", Lingo::b_alert, 1, 1, false }, // D2 { "cursor", Lingo::b_cursor, 1, 1, false }, // D2 { "printFrom", Lingo::b_printFrom, -1,0, false }, // D2 - { "ilk", Lingo::b_ilk, 1, 2, true }, // D4 + { "ilk", Lingo::b_ilk, 1, 2, true }, // D4 // put // D2 // set // D2 { "objectp", Lingo::b_objectp, 1, 1, true }, @@ -101,7 +101,7 @@ static struct BuiltinProto { // go // D2 { "installMenu", Lingo::b_installMenu, 1, 1, false }, // D2 { "label", Lingo::b_label, 1, 1, true }, // D2 - { "marker", Lingo::b_marker, 1, 1, true }, // D2 + { "marker", Lingo::b_marker, 1, 1, true }, // D2 { "moveableSprite", Lingo::b_moveableSprite,0, 0, false }, // D2 { "puppetPalette", Lingo::b_puppetPalette, -1,0, false }, // D2 { "puppetSound", Lingo::b_puppetSound, -1,0, false }, // D2 @@ -128,7 +128,8 @@ static struct BuiltinProto { { "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 + { "field", Lingo::b_field, 1, 1, false }, // D3 + { "me", Lingo::b_me, -1,0, false }, // D3 { 0, 0, 0, 0, false } @@ -830,5 +831,9 @@ void Lingo::b_field(int nargs) { warning("STUB: b_field"); } +void Lingo::b_me(int nargs) { + g_lingo->printStubWithArglist("me", nargs); +} + } // End of namespace Director diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp index 89d8746b0d..fce45d0b9e 100644 --- a/engines/director/lingo/lingo-the.cpp +++ b/engines/director/lingo/lingo-the.cpp @@ -32,7 +32,7 @@ TheEntity entities[] = { { kTheBeepOn, "beepOn", false }, // D2 property { kTheButtonStyle, "buttonStyle", false }, // D2 p { kTheCast, "cast", true }, // D3 - { kTheCastMembers, "castmembers", true }, // D3 + { kTheCastMembers, "castmembers", true }, // D3 { kTheCenterStage, "centerStage", false }, // D2 p { kTheCheckBoxAccess, "checkBoxAccess", false }, // D2 p { kTheCheckBoxType, "checkBoxType", false }, // D2 p @@ -141,7 +141,7 @@ TheEntityField fields[] = { { kTheSprite, "width", kTheWidth }, // D2 p // the number of castmembers - { kTheCastMembers, "number", kTheNumber }, // D3 p + { kTheCastMembers, "number", kTheNumber }, // D3 p // Common cast fields { kTheCast, "castType", kTheCastType }, diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h index 1484b9a3b7..074947eee9 100644 --- a/engines/director/lingo/lingo.h +++ b/engines/director/lingo/lingo.h @@ -388,6 +388,7 @@ public: void factoryCall(Common::String &name, int nargs); static void b_field(int nargs); + static void b_me(int nargs); void func_mci(Common::String &s); void func_mciwait(Common::String &s); |