[Scummvm-git-logs] scummvm master -> 62ff4ddb4c1b6b30428e61bb6e2cbd49fca57e61

[sev-]

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

Summary:
d0b5529e15 DIRECTOR: Added stub for parent scripts
62ff4ddb4c DIRECTOR: LINGO: Improved debug output on float constants loading


Commit: d0b5529e156998ca05333cdb2b7558cf5b312011
    https://github.com/scummvm/scummvm/commit/d0b5529e156998ca05333cdb2b7558cf5b312011
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-05-13T17:38:00+02:00

Commit Message:
DIRECTOR: Added stub for parent scripts

Changed paths:
    engines/director/castmember/script.cpp
    engines/director/types.cpp
    engines/director/types.h


diff --git a/engines/director/castmember/script.cpp b/engines/director/castmember/script.cpp
index 88c8d9c5d7a..ccd7d2eefa7 100644
--- a/engines/director/castmember/script.cpp
+++ b/engines/director/castmember/script.cpp
@@ -47,6 +47,10 @@ ScriptCastMember::ScriptCastMember(Cast *cast, uint16 castId, Common::SeekableRe
 		case 3:
 			_scriptType = kMovieScript;
 			break;
+		case 7:
+			_scriptType = kParentScript;
+			warning("Unhandled kParentScript %d", castId);
+			break;
 		default:
 			error("ScriptCastMember: Unprocessed script type: %d", type);
 		}
diff --git a/engines/director/types.cpp b/engines/director/types.cpp
index 09845265fe9..638d6605886 100644
--- a/engines/director/types.cpp
+++ b/engines/director/types.cpp
@@ -30,7 +30,10 @@ const char *scriptTypes[] = {
 	"CastScript",
 	"MovieScript",
 	"EventScript",
-	"TestScript"
+	"TestScript",
+	"ScriptType5",
+	"ScriptType6",
+	"ParentScript",
 };
 
 const char *scriptType2str(ScriptType scr) {
diff --git a/engines/director/types.h b/engines/director/types.h
index d0cfed4d6fd..ee8557482d3 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -64,7 +64,8 @@ enum ScriptType {
 	kMovieScript = 2,
 	kEventScript = 3,
 	kTestScript = 4,
-	kMaxScriptType = 4	// Sync with types.cpp:28, array scriptTypes[]
+	kParentScript = 7,
+	kMaxScriptType = 7	// Sync with types.cpp:28, array scriptTypes[]
 };
 
 enum ScriptFlag {


Commit: 62ff4ddb4c1b6b30428e61bb6e2cbd49fca57e61
    https://github.com/scummvm/scummvm/commit/62ff4ddb4c1b6b30428e61bb6e2cbd49fca57e61
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-05-13T17:39:06+02:00

Commit Message:
DIRECTOR: LINGO: Improved debug output on float constants loading

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


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 05b734cac8c..746a9ee31d9 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -1221,7 +1221,7 @@ ScriptContext *LingoCompiler::compileLingoV4(Common::SeekableReadStreamEndian &s
 				// point number (Standard Apple Numeric Environment [SANE] data type
 				// Extended).
 				if (length != 10) {
-					error("Constant float expected to be 10 bytes");
+					error("Constant float expected to be 10 bytes but got %d", length);
 					break;
 				}
 				uint16 signAndExponent = READ_BE_UINT16(&constsStore[pointer]);