libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 11:51:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: LINGO: Make undefined function/property cause Lingo error

Browse Source
This commit is contained in:
djsrv 2021-06-28 14:08:45 -04:00
parent 3530f2c394
commit eb7f93e670
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/director/lingo/lingo-code.cpp
View File

@ -1407,7 +1407,7 @@ void LC::call(const Common::String &name, int nargs, bool allowRetVal) {
g_lingo->_stack[g_lingo->_stack.size() - nargs] = funcSym.target; // Set first arg to target
call(funcSym, nargs, allowRetVal);
} else {
warning("Object <%s> has no method '%s'", obj.asString(true).c_str(), firstArg.u.s->c_str());
g_lingo->lingoError("Object <%s> has no method '%s'", obj.asString(true).c_str(), firstArg.u.s->c_str());
}
return;
}
@ -1459,7 +1459,7 @@ void LC::call(const Symbol &funcSym, int nargs, bool allowRetVal) {
Datum target = funcSym.target;
if (funcSym.type == VOIDSYM) {
warning("Call to undefined handler. Dropping %d stack items", nargs);
g_lingo->lingoError("Call to undefined handler. Dropping %d stack items", nargs);
for (int i = 0; i < nargs; i++)
g_lingo->pop();

20
engines/director/lingo/lingo-the.cpp
View File

@ -1603,7 +1603,7 @@ void Lingo::getObjectProp(Datum &obj, Common::String &propName) {
if (obj.u.obj->hasProp(propName)) {
d = obj.u.obj->getProp(propName);
} else {
warning("Lingo::getObjectProp: Object <%s> has no property '%s'", obj.asString(true).c_str(), propName.c_str());
g_lingo->lingoError("Lingo::getObjectProp: Object <%s> has no property '%s'", obj.asString(true).c_str(), propName.c_str());
}
g_lingo->push(d);
return;
@ -1619,7 +1619,7 @@ void Lingo::getObjectProp(Datum &obj, Common::String &propName) {
if (obj.type == CASTREF) {
Movie *movie = _vm->getCurrentMovie();
if (!movie) {
warning("Lingo::getObjectProp(): No movie loaded");
g_lingo->lingoError("Lingo::getObjectProp(): No movie loaded");
g_lingo->push(d);
return;
}
@ -1630,7 +1630,7 @@ void Lingo::getObjectProp(Datum &obj, Common::String &propName) {
if (propName.equalsIgnoreCase("loaded")) {
d = 0;
} else {
warning("Lingo::getObjectProp(): CastMember %d not found", id);
g_lingo->lingoError("Lingo::getObjectProp(): CastMember %d not found", id);
}
g_lingo->push(d);
return;
@ -1639,7 +1639,7 @@ void Lingo::getObjectProp(Datum &obj, Common::String &propName) {
if (member->hasProp(propName)) {
d = member->getProp(propName);
} else {
warning("Lingo::getObjectProp(): CastMember %d has no property '%s'", id, propName.c_str());
g_lingo->lingoError("Lingo::getObjectProp(): CastMember %d has no property '%s'", id, propName.c_str());
}
g_lingo->push(d);
return;
@ -1649,7 +1649,7 @@ void Lingo::getObjectProp(Datum &obj, Common::String &propName) {
LC::call(_builtinFuncs[propName], 1, true);
return;
}
warning("Lingo::getObjectProp: Invalid object: %s", obj.asString(true).c_str());
g_lingo->lingoError("Lingo::getObjectProp: Invalid object: %s", obj.asString(true).c_str());
g_lingo->push(d);
}
@ -1658,7 +1658,7 @@ void Lingo::setObjectProp(Datum &obj, Common::String &propName, Datum &val) {
if (obj.u.obj->hasProp(propName)) {
obj.u.obj->setProp(propName, val);
} else {
warning("Lingo::setObjectProp: Object <%s> has no property '%s'", obj.asString(true).c_str(), propName.c_str());
g_lingo->lingoError("Lingo::setObjectProp: Object <%s> has no property '%s'", obj.asString(true).c_str(), propName.c_str());
}
} else if (obj.type == PARRAY) {
int index = LC::compareArrays(LC::eqData, obj, propName, true).u.i;
@ -1671,24 +1671,24 @@ void Lingo::setObjectProp(Datum &obj, Common::String &propName, Datum &val) {
} else if (obj.type == CASTREF) {
Movie *movie = _vm->getCurrentMovie();
if (!movie) {
warning("Lingo::setObjectProp(): No movie loaded");
g_lingo->lingoError("Lingo::setObjectProp(): No movie loaded");
return;
}
int id = obj.u.i;
CastMember *member = movie->getCastMember(id);
if (!member) {
warning("Lingo::setObjectProp(): CastMember %d not found", id);
g_lingo->lingoError("Lingo::setObjectProp(): CastMember %d not found", id);
return;
}
if (member->hasProp(propName)) {
member->setProp(propName, val);
} else {
warning("Lingo::setObjectProp(): CastMember %d has no property '%s'", id, propName.c_str());
g_lingo->lingoError("Lingo::setObjectProp(): CastMember %d has no property '%s'", id, propName.c_str());
}
} else {
warning("Lingo::setObjectProp: Invalid object: %s", obj.asString(true).c_str());
g_lingo->lingoError("Lingo::setObjectProp: Invalid object: %s", obj.asString(true).c_str());
}
}