[Scummvm-git-logs] scummvm master -> 3047a6b47e811683ff629894000658d5d7319084

[rvanlaar]

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:
3047a6b47e DIRECTOR: LINGO: Fix messages


Commit: 3047a6b47e811683ff629894000658d5d7319084
    https://github.com/scummvm/scummvm/commit/3047a6b47e811683ff629894000658d5d7319084
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-06-25T21:31:11+02:00

Commit Message:
DIRECTOR: LINGO: Fix messages

The order type and cast id was switched in error and
warning messages.

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


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 78fd6d1b6e..fdc784bd94 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -858,7 +858,7 @@ void Lingo::addCodeV4(Common::SeekableSubReadStreamEndian &stream, int archiveIn
 	if (getScriptContext(archiveIndex, scriptType, castId)) {
 		// We can't undefine context data because it could be used in e.g. symbols.
 		// Abort on double definitions.
-		error("Script already defined for type %d, id %d", castId, scriptType);
+		error("Script already defined for type %d, id %d", scriptType, castId);
 		return;
 	}
 
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 42477e2ae9..3737ecbf19 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -272,7 +272,7 @@ void Lingo::addCode(const char *code, int archiveIndex, ScriptType type, uint16
 		// We can't undefine context data because it could be used in e.g. symbols.
 		// Although it has a legit case when kTheScriptText re sets code.
 		// Warn on double definitions.
-		warning("Script already defined for type %d, id %d", id, type);
+		warning("Script already defined for type %d, id %d", type, id);
 	}
 
 	Common::String contextName;