Yet another fix for broken parsing/displaying of strings. Now quotes are properly considered when they are needed, and ignored when they aren't.

svn-id: r27967

1 files changed, 8 insertions, 3 deletions

diff --git a/engines/parallaction/parser.cpp b/engines/parallaction/parser.cpp
index 6fd21b3099..44aae6c1cc 100644
--- a/engines/parallaction/parser.cpp
+++ b/engines/parallaction/parser.cpp
@@ -127,7 +127,7 @@ void clearTokens() {
 //
 //	The routine returns the unparsed portion of the input string 's'.
 //
-char *parseNextToken(char *s, char *tok, uint16 count, const char *brk) {
+char *parseNextToken(char *s, char *tok, uint16 count, const char *brk, bool ignoreQuotes) {
 
 	enum STATES { NORMAL, QUOTED };
 
@@ -150,8 +150,13 @@ char *parseNextToken(char *s, char *tok, uint16 count, const char *brk) {
 			}
 
 			if (*s == '"') {
-				state = QUOTED;
-				s++;
+				if (ignoreQuotes) {
+					*tok++ = *s++;
+					count--;
+				} else {
+					state = QUOTED;
+					s++;
+				}
 			} else {
 				*tok++ = *s++;
 				count--;