[Scummvm-cvs-logs] scummvm master -> cc818b444c454d2f8978655d5c29f379cbe21376

clone2727 clone2727 at gmail.com
Tue Jun 28 19:53:55 CEST 2011


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:
cc818b444c MOHAWK: Use matchString instead of equalsIgnoreCase for resource names


Commit: cc818b444c454d2f8978655d5c29f379cbe21376
    https://github.com/scummvm/scummvm/commit/cc818b444c454d2f8978655d5c29f379cbe21376
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-06-28T10:51:03-07:00

Commit Message:
MOHAWK: Use matchString instead of equalsIgnoreCase for resource names

A regression from 71c4329

Changed paths:
    engines/mohawk/resource.cpp



diff --git a/engines/mohawk/resource.cpp b/engines/mohawk/resource.cpp
index 2dc6d22..df8271d 100644
--- a/engines/mohawk/resource.cpp
+++ b/engines/mohawk/resource.cpp
@@ -74,7 +74,7 @@ bool Archive::hasResource(uint32 tag, const Common::String &resName) const {
 	const ResourceMap &resMap = _types[tag];
 
 	for (ResourceMap::const_iterator it = resMap.begin(); it != resMap.end(); it++)
-		if (it->_value.name.equalsIgnoreCase(resName))
+		if (it->_value.name.matchString(resName))
 			return true;
 
 	return false;
@@ -113,7 +113,7 @@ uint16 Archive::findResourceID(uint32 tag, const Common::String &resName) const
 	const ResourceMap &resMap = _types[tag];
 
 	for (ResourceMap::const_iterator it = resMap.begin(); it != resMap.end(); it++)
-		if (it->_value.name.equalsIgnoreCase(resName))
+		if (it->_value.name.matchString(resName))
 			return it->_key;
 
 	return 0xFFFF;






More information about the Scummvm-git-logs mailing list