[Scummvm-git-logs] scummvm master -> 3e1b86b7c0e6b14b545c81acb061c499246fd88b

rvanlaar roland at rolandvanlaar.nl
Mon Jun 29 21:01:44 UTC 2020


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3e1b86b7c0 DIRECTOR: LINGO: Handle setTheCast with castName


Commit: 3e1b86b7c0e6b14b545c81acb061c499246fd88b
    https://github.com/scummvm/scummvm/commit/3e1b86b7c0e6b14b545c81acb061c499246fd88b
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-06-29T22:55:25+02:00

Commit Message:
DIRECTOR: LINGO: Handle setTheCast with castName

Casts can be set by castId or by castName.
This resolves the following warning:

    WARNING: Lingo::setTheCast(): Unknown the cast id type: STRING!

Changed paths:
    engines/director/lingo/lingo-the.cpp


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 4d0e722aa8..430f049397 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1046,6 +1046,8 @@ void Lingo::setTheCast(Datum &id1, int field, Datum &d) {
 
 	if (id1.type == INT) {
 		id = id1.u.i;
+	} else if (id1.type == STRING) {
+		id = g_lingo->castIdFetch(id1);
 	} else {
 		warning("Lingo::setTheCast(): Unknown the cast id type: %s", id1.type2str());
 		return;




More information about the Scummvm-git-logs mailing list