aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2017-02-07 10:45:24 +0100
committerEugene Sandulenko2017-02-07 10:45:24 +0100
commit54aac6a03c1e655e13ccebeca2ea2a77d2c95382 (patch)
treec7ad9c67863d813e9665597edd032035f4cd30ab
parentb37a3e522461236bb4804415f83fbddb12d862a4 (diff)
downloadscummvm-rg350-54aac6a03c1e655e13ccebeca2ea2a77d2c95382.tar.gz
scummvm-rg350-54aac6a03c1e655e13ccebeca2ea2a77d2c95382.tar.bz2
scummvm-rg350-54aac6a03c1e655e13ccebeca2ea2a77d2c95382.zip
DIRECTOR: Lingo: Fixed typo in builtin list and added sanity check to catch it
-rw-r--r--engines/director/lingo/lingo-builtins.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 1042ca5973..552030a155 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -122,7 +122,7 @@ static struct BuiltinProto {
{ "ilk", Lingo::b_ilk, 1, 2, false }, // D4 f
{ "integerp", Lingo::b_integerp, 1, 1, true }, // D2 f
{ "objectp", Lingo::b_objectp, 1, 1, true }, // D2 f
- { "puctureP", Lingo::b_pictureP, 1, 1, true }, // D4 f
+ { "pictureP", Lingo::b_pictureP, 1, 1, true }, // D4 f
{ "stringp", Lingo::b_stringp, 1, 1, true }, // D2 f
{ "symbolp", Lingo::b_symbolp, 1, 1, true }, // D2 f
// Misc
@@ -258,8 +258,12 @@ void Lingo::initBuiltIns() {
_functions[(void *)sym->u.s] = new FuncDesc(blt->name, "");
}
- for (const char **b = builtinFunctions; *b; b++)
+ for (const char **b = builtinFunctions; *b; b++) {
+ if (!_builtins.contains(*b))
+ error("Incorrectly setup builtinFunctions[]: %s", *b);
+
_builtins[*b]->type = FBLTIN;
+ }
for (const char **b = twoWordBuiltins; *b; b++)
_twoWordBuiltins[*b] = true;