[Scummvm-git-logs] scummvm master -> 236dd400381874f80eb94029741c5c6d984cc961

[sev-]

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:
236dd40038 DIRECTOR: Fix comparison between symbol and string


Commit: 236dd400381874f80eb94029741c5c6d984cc961
    https://github.com/scummvm/scummvm/commit/236dd400381874f80eb94029741c5c6d984cc961
Author: Harishankar Kumar (hari01584 at gmail.com)
Date: 2023-06-20T09:02:27+02:00

Commit Message:
DIRECTOR: Fix comparison between symbol and string

Added comparison between symbol and string, initially it was
happening that the comparison was not working and thus for equality
in many places a <Void> was being placed, this impacted other parts
of lingo, ex comparison, equality, etc.

Fixes misplaced <Void> in game saves of 'totaldistortion' when
sleeping to bed.

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 16d357ee8f3..9b08a6c269a 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -784,6 +784,8 @@ int Lingo::getAlignedType(const Datum &d1, const Datum &d2, bool numsOnly) {
 		opType = INT;
 	} else if ((d1Type == STRING && d2Type == INT) || (d1Type == INT && d2Type == STRING)) {
 		opType = STRING;
+	} else if ((d1Type == STRING && d2Type == SYMBOL) || (d1Type == SYMBOL && d2Type == STRING)) {
+		opType = STRING;
 	}
 
 	return opType;