diff options
| author | stevenhoefel | 2017-01-12 08:58:48 +1100 |
|---|---|---|
| committer | stevenhoefel | 2017-01-12 08:58:48 +1100 |
| commit | 1f95f5c161d8123d4d674dae2917dc6b180ca6aa (patch) | |
| tree | 6a1540c12fce586183496fe114f428981a0be13c /engines/director/lingo/lingo-lex.cpp | |
| parent | 5c985ab549ae9ac2c47bf32f7951fca80db071f1 (diff) | |
| download | scummvm-rg350-1f95f5c161d8123d4d674dae2917dc6b180ca6aa.tar.gz scummvm-rg350-1f95f5c161d8123d4d674dae2917dc6b180ca6aa.tar.bz2 scummvm-rg350-1f95f5c161d8123d4d674dae2917dc6b180ca6aa.zip | |
DIRECTOR: Hook Lingo events through. Tie in frame events.
Diffstat (limited to 'engines/director/lingo/lingo-lex.cpp')
| -rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index f3c498b5a8..dc502cf588 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -1443,19 +1443,19 @@ YY_RULE_SETUP return tME; } - if (g_lingo->_handlers.contains(yytext)) { - if (g_lingo->_handlers[yytext]->type == BLTIN && g_lingo->_handlers[yytext]->parens == false) { - if (g_lingo->_handlers[yytext]->nargs == 0) { - if (g_lingo->_handlers[yytext]->maxArgs == 0) + if (g_lingo->_builtins.contains(yytext)) { + if (g_lingo->_builtins[yytext]->type == BLTIN && g_lingo->_builtins[yytext]->parens == false) { + if (g_lingo->_builtins[yytext]->nargs == 0) { + if (g_lingo->_builtins[yytext]->maxArgs == 0) return BLTINNOARGS; - else if (g_lingo->_handlers[yytext]->maxArgs == 1) + else if (g_lingo->_builtins[yytext]->maxArgs == 1) return BLTINNOARGSORONE; else error("Incorrect setup for builtin: %s", yytext); - } else if (g_lingo->_handlers[yytext]->nargs == 1 && - g_lingo->_handlers[yytext]->maxArgs == 1) { + } else if (g_lingo->_builtins[yytext]->nargs == 1 && + g_lingo->_builtins[yytext]->maxArgs == 1) { return BLTINONEARG; - } else if (g_lingo->_handlers[yytext]->nargs == -1) { + } else if (g_lingo->_builtins[yytext]->nargs == -1) { return BLTINARGLIST; } else { error("Incorrect setup for builtin: %s", yytext); |