[Scummvm-cvs-logs] scummvm master -> 740d1620f20511449c492190fa6432bb85439cc9

bluegr bluegr at gmail.com
Wed Oct 15 18:44:50 CEST 2014


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:
740d1620f2 SCI: Simplify check for non-alphanumeric characters in the parser


Commit: 740d1620f20511449c492190fa6432bb85439cc9
    https://github.com/scummvm/scummvm/commit/740d1620f20511449c492190fa6432bb85439cc9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-10-15T19:44:03+03:00

Commit Message:
SCI: Simplify check for non-alphanumeric characters in the parser

This is also for bug #6608. Many thanks to wjp for his help with this

Changed paths:
    engines/sci/parser/vocabulary.cpp



diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index 7fc02dc..000b037 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -535,10 +535,7 @@ bool Vocabulary::tokenizeString(ResultWordListList &retval, const char *sentence
 		if (Common::isAlnum(c) || (c == '-' && wordLen) || (c >= 0x80)) {
 			currentWord[wordLen] = lowerCaseMap[c];
 			++wordLen;
-		} else if (!Common::isAlpha(c) && c != '-' && c != ' ' && c != '\0' && (g_sci->getLanguage() != Common::JA_JPN)) {
-			// Skip non-alphanumeric characters in the string.
-			// Note: hyphens ('-'), spaces and string terminators are handled in the other branches.
-		} else {
+		} else if (c == ' ' || c == '\0') {
 			// Continue on this word. Words may contain a '-', but may not start with
 			// one.
 






More information about the Scummvm-git-logs mailing list