[Scummvm-cvs-logs] CVS: scummvm/common str.cpp,1.10,1.11

Max Horn fingolfin at users.sourceforge.net
Wed Nov 20 18:54:04 CET 2002


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv4172a

Modified Files:
	str.cpp 
Log Message:
operator < and > for String now ignore case

Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- str.cpp	15 Nov 2002 17:45:23 -0000	1.10
+++ str.cpp	21 Nov 2002 02:53:49 -0000	1.11
@@ -246,16 +246,16 @@
 
 bool ConstString::operator < (const ConstString& x) const
 {
-	if (!_len || !x._len)	// Any or both particpants are empty?
+	if (!_len || !x._len)	// Any or both empty?
 		return !_len && x._len;	// Less only if this string is empty and the other isn't
-	return strcmp(_str, x._str) < 0;
+	return scumm_stricmp(_str, x._str) < 0;
 }
 
 bool ConstString::operator <= (const ConstString& x) const
 {
-	if (!_len || !x._len)	// Any or both particpants are empty?
+	if (!_len || !x._len)	// Any or both empty?
 		return !_len;	// Less or equal unless the other string is empty and this one isn't
-	return strcmp(_str, x._str) <= 0;
+	return scumm_stricmp(_str, x._str) <= 0;
 }
 
 bool ConstString::operator > (const ConstString& x) const





More information about the Scummvm-git-logs mailing list