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

[bluegr]

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:
e11fe13620 SCI: Handle 's at the end of words - bug #6608


Commit: e11fe13620be4b500c91b6141337786948c13694
    https://github.com/scummvm/scummvm/commit/e11fe13620be4b500c91b6141337786948c13694
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-08-08T03:59:02+03:00

Commit Message:
SCI: Handle 's at the end of words - bug #6608

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



diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index b4a223d..3344b79 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -530,18 +530,19 @@ bool Vocabulary::tokenizeString(ResultWordListList &retval, const char *sentence
 	*error = NULL;
 
 	do {
-
 		c = sentence[pos_in_sentence++];
+
 		if (Common::isAlnum(c) || (c == '-' && wordLen) || (c >= 0x80)) {
 			currentWord[wordLen] = lowerCaseMap[c];
 			++wordLen;
-		}
-		// Continue on this word */
-		// Words may contain a '-', but may not
-		// start with one.
-		else {
-			if (wordLen) { // Finished a word?
+		} else if (c == '\'' && wordLen && (sentence[pos_in_sentence] == 's' || sentence[pos_in_sentence] == 'S')) {
+			// Skip apostrophe-s at the end of the word, if it exists
+			pos_in_sentence++;	// skip the 's'
+		} else {
+			// Continue on this word. Words may contain a '-', but may not start with
+			// one.
 
+			if (wordLen) { // Finished a word?
 				ResultWordList lookup_result;
 
 				// Look it up