[Scummvm-git-logs] scummvm master -> 225690aa78c73b51755e626827b9a088909df974

[sev-]

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

Summary:
6e4c6ed131 Revert "WAGE: Implement another comparison condition"
39b47675ea Revert "WAGE: Cover string/string equality test in scripts"
225690aa78 WAGE: Added more debug output to script execution


Commit: 6e4c6ed1312fd114c8f13235c7f83deac7618c44
    https://github.com/scummvm/scummvm/commit/6e4c6ed1312fd114c8f13235c7f83deac7618c44
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-30T10:17:35+01:00

Commit Message:
Revert "WAGE: Implement another comparison condition"

This reverts commit 2a1072c2f835acad40d64cada8a659a8ed117478.

Changed paths:
    engines/wage/script.cpp


diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index 585b1088728..5fbf0c2aa67 100644
--- a/engines/wage/script.cpp
+++ b/engines/wage/script.cpp
@@ -644,7 +644,6 @@ enum {
 	kCompEqTextInputString,
 	kCompEqNumberTextInput,
 	kCompEqTextInputNumber,
-	kCompEqStringChr,
 	kCompLtNumNum,
 	kCompLtStringTextInput,
 	kCompLtTextInputString,
@@ -693,7 +692,6 @@ struct Comparator {
 	{ '=', STRING, STRING, kCompEqStringString },
 	{ '=', NUMBER, TEXT_INPUT, kCompEqNumberTextInput },
 	{ '=', TEXT_INPUT, NUMBER, kCompEqTextInputNumber },
-	{ '=', STRING, CHR, kCompEqStringChr },
 
 	{ '<', NUMBER, NUMBER, kCompLtNumNum },
 	{ '<', STRING, TEXT_INPUT, kCompLtStringTextInput },
@@ -761,15 +759,6 @@ bool Script::compare(Operand *o1, Operand *o2, int comparator) {
 					return true;
 		}
 		return false;
-	case kCompEqStringChr:
-		if (o2->_value.chr == NULL) {
-			debug(1, "%s() o2->_value.chr is null", __func__);
-		} else {
-			for (const auto &obj : o2->_value.chr->_inventory)
-				if (obj->_name.equalsIgnoreCase(*o1->_value.string))
-					return true;
-		}
-		return false;
 	case kCompEqChrChr:
 		return o1->_value.chr == o2->_value.chr;
 	case kCompEqSceneScene:


Commit: 39b47675ea9ddc2dc5e35278cc217ff27dbe5578
    https://github.com/scummvm/scummvm/commit/39b47675ea9ddc2dc5e35278cc217ff27dbe5578
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-30T10:17:41+01:00

Commit Message:
Revert "WAGE: Cover string/string equality test in scripts"

This reverts commit d62648804631b190c359656dbd8f43b02d31b3fa.

Changed paths:
    engines/wage/script.cpp


diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index 5fbf0c2aa67..2dc0ffcdf59 100644
--- a/engines/wage/script.cpp
+++ b/engines/wage/script.cpp
@@ -640,7 +640,6 @@ enum {
 	kCompEqChrChr,
 	kCompEqSceneScene,
 	kCompEqStringTextInput,
-	kCompEqStringString,
 	kCompEqTextInputString,
 	kCompEqNumberTextInput,
 	kCompEqTextInputNumber,
@@ -689,7 +688,6 @@ struct Comparator {
 	{ '=', SCENE, SCENE, kCompEqSceneScene },
 	{ '=', STRING, TEXT_INPUT, kCompEqStringTextInput },
 	{ '=', TEXT_INPUT, STRING, kCompEqTextInputString },
-	{ '=', STRING, STRING, kCompEqStringString },
 	{ '=', NUMBER, TEXT_INPUT, kCompEqNumberTextInput },
 	{ '=', TEXT_INPUT, NUMBER, kCompEqTextInputNumber },
 
@@ -775,14 +773,6 @@ bool Script::compare(Operand *o1, Operand *o2, int comparator) {
 		}
 	case kCompEqTextInputString:
 		return compare(o2, o1, kCompEqStringTextInput);
-	case kCompEqStringString:
-		{
-			Common::String s1(*o1->_value.string), s2(*o2->_value.string);
-			s1.toLowercase();
-			s2.toLowercase();
-
-			return s1.contains(s2);
-		}
 	case kCompEqNumberTextInput:
 		if (_inputText == NULL) {
 			return false;


Commit: 225690aa78c73b51755e626827b9a088909df974
    https://github.com/scummvm/scummvm/commit/225690aa78c73b51755e626827b9a088909df974
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-30T10:39:27+01:00

Commit Message:
WAGE: Added more debug output to script execution

Changed paths:
    engines/wage/script.cpp


diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index 2dc0ffcdf59..83c793d8085 100644
--- a/engines/wage/script.cpp
+++ b/engines/wage/script.cpp
@@ -657,6 +657,40 @@ enum {
 	kMoveChrScene
 };
 
+#define defEnum(x) #x
+
+static const char *compList[] = {
+	defEnum(kCompEqNumNum),
+	defEnum(kCompEqObjScene),
+	defEnum(kCompEqChrScene),
+	defEnum(kCompEqObjChr),
+	defEnum(kCompEqChrChr),
+	defEnum(kCompEqSceneScene),
+	defEnum(kCompEqStringTextInput),
+	defEnum(kCompEqTextInputString),
+	defEnum(kCompEqNumberTextInput),
+	defEnum(kCompEqTextInputNumber),
+	defEnum(kCompLtNumNum),
+	defEnum(kCompLtStringTextInput),
+	defEnum(kCompLtTextInputString),
+	defEnum(kCompLtObjChr),
+	defEnum(kCompLtChrObj),
+	defEnum(kCompLtObjScene),
+	defEnum(kCompGtNumNum),
+	defEnum(kCompGtStringString),
+	defEnum(kCompGtChrScene),
+	defEnum(kMoveObjChr),
+	defEnum(kMoveObjScene),
+	defEnum(kMoveChrScene),
+};
+
+Common::String comp2str(int fl) {
+	if (fl >= ARRAYSIZE(compList) || fl < 0)
+		return Common::String::format("<%d>", fl);
+
+	return compList[fl];
+}
+
 static const char *typeNames[] = {
 	"OBJ",
 	"CHR",
@@ -726,6 +760,8 @@ bool Script::compare(Operand *o1, Operand *o2, int comparator) {
 		return false;
 	}
 
+	debug(9, "     comparator %s with %s with %s", typeNames[o1->_type], typeNames[o2->_type], comp2str(comparator).c_str());
+
 	switch(comparator) {
 	case kCompEqNumNum:
 		return o1->_value.number == o2->_value.number;
@@ -868,6 +904,7 @@ bool Script::evaluatePair(Operand *lhs, const char *op, Operand *rhs) {
 
 	// Now, try partial matches.
 	Operand *c1, *c2;
+	debug(8, "   no direct comparators, trying partial matches");
 	for (int cmp = 0; comparators[cmp].op != 0; cmp++) {
 		if (comparators[cmp].op != op[0])
 			continue;
@@ -886,6 +923,7 @@ bool Script::evaluatePair(Operand *lhs, const char *op, Operand *rhs) {
 	}
 
 	// Now, try double conversion.
+	debug(8, "   no direct comparators, trying double conversion");
 	for (int cmp = 0; comparators[cmp].op != 0; cmp++) {
 		if (comparators[cmp].op != op[0])
 			continue;