[Scummvm-git-logs] scummvm master -> 8d12eac51999da2357b5475f76784ca964b86494

[aquadran]

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:
8d12eac519 WINTERMUTE: Make sure comparing names are case-insensitive like in original


Commit: 8d12eac51999da2357b5475f76784ca964b86494
    https://github.com/scummvm/scummvm/commit/8d12eac51999da2357b5475f76784ca964b86494
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-27T07:39:36+01:00

Commit Message:
WINTERMUTE: Make sure comparing names are case-insensitive like in original

Changed paths:
    engines/wintermute/ad/ad_actor_3dx.cpp


diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index 5f9096198f7..c94f256551b 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -1958,7 +1958,7 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 		bool found = false;
 		for (uint32 i = 0; i < _transitionTimes.size(); i++) {
 			BaseAnimationTransitionTime *trans = _transitionTimes[i];
-			if (trans->_animFrom == animFrom && trans->_animTo == animTo) {
+			if (!trans->_animFrom.empty() && !trans->_animTo.empty() && trans->_animFrom.compareToIgnoreCase(animFrom) == 0 && trans->_animTo.compareToIgnoreCase(animTo) == 0) {
 				found = true;
 				if (time < 0) {
 					delete trans;
@@ -1990,7 +1990,7 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 		for (uint32 i = 0; i < _transitionTimes.size(); i++) {
 			BaseAnimationTransitionTime *trans = _transitionTimes[i];
 
-			if (trans->_animFrom == animFrom && trans->_animTo == animTo) {
+			if (!trans->_animFrom.empty() && !trans->_animTo.empty() && trans->_animFrom.compareToIgnoreCase(animFrom) == 0 && trans->_animTo.compareToIgnoreCase(animTo) == 0) {
 				time = trans->_time;
 				break;
 			}
@@ -2427,7 +2427,7 @@ bool AdActor3DX::isGoToNeeded(int x, int y) {
 uint32 AdActor3DX::getAnimTransitionTime(char *from, char *to) {
 	for (uint32 i = 0; i < _transitionTimes.size(); i++) {
 		BaseAnimationTransitionTime *trans = _transitionTimes[i];
-		if (trans->_animFrom == from && trans->_animTo == to) {
+		if (!trans->_animFrom.empty() && !trans->_animTo.empty() && trans->_animFrom.compareToIgnoreCase(from) == 0 && trans->_animTo.compareToIgnoreCase(to) == 0) {
 			return trans->_time;
 		}
 	}