refactoring

svn-id: r25724

1 files changed, 23 insertions, 50 deletions

diff --git a/engines/parallaction/parser.cpp b/engines/parallaction/parser.cpp
index 9a1d30378a..2f97b37bf3 100644
--- a/engines/parallaction/parser.cpp
+++ b/engines/parallaction/parser.cpp
@@ -83,23 +83,9 @@ char *parseComment(ArchivedFile *file) {
 	return v194;
 }
 
-uint16 parseFillBuffers() {
-
-	uint16 i;
-	for (i = 0; i < 20; i++)
-		_tokens[i][0] = '\0';
+uint16 fillTokens(char* line) {
 
-	char buf[200];
-	char *line = NULL;
-	do {
-		line = parseNextLine(buf, 200);
-		if (line == NULL) {
-			error("unexpected end of file while parsing");
-		}
-		line = Common::ltrim(line);
-	} while (strlen(line) == 0 || line[0] == '#');
-
-	i = 0;
+	uint16 i = 0;
 	while (strlen(line) > 0 && i < 20) {
 		line = parseNextToken(line, _tokens[i], 40, " \t\n");
 		if (_tokens[i][0] == '"' && _tokens[i][strlen(_tokens[i]) - 1] != '"') {
@@ -118,6 +104,25 @@ uint16 parseFillBuffers() {
 	return i;
 }
 
+uint16 parseFillBuffers() {
+
+	uint16 i;
+	for (i = 0; i < 20; i++)
+		_tokens[i][0] = '\0';
+
+	char buf[200];
+	char *line = NULL;
+	do {
+		line = parseNextLine(buf, 200);
+		if (line == NULL) {
+			error("unexpected end of file while parsing");
+		}
+		line = Common::ltrim(line);
+	} while (strlen(line) == 0 || line[0] == '#');
+
+	return fillTokens(line);
+}
+
 //
 //	FIXME
 //	this function does the same Job as parseFillBuffers, except that
@@ -139,23 +144,7 @@ uint16 tableFillBuffers(Common::SeekableReadStream &stream) {
 		line = Common::ltrim(line);
 	} while (strlen(line) == 0 || line[0] == '#');
 
-	i = 0;
-	while (strlen(line) > 0 && i < 20) {
-		line = parseNextToken(line, _tokens[i], 40, " \t\n");
-		if (_tokens[i][0] == '"' && _tokens[i][strlen(_tokens[i]) - 1] != '"') {
-
-			line = parseNextToken(line, _tokens[i+1], 40, "\"");
-			strcat(_tokens[i], _tokens[i+1]);
-			_tokens[i][0] = ' ';
-			line++;
-
-		}
-
-		line = Common::ltrim(line);
-		i++;
-	}
-
-	return i;
+	return fillTokens(line);
 }
 
 
@@ -179,23 +168,7 @@ uint16 scriptFillBuffers(ArchivedFile *file) {
 		line = Common::ltrim(line);
 	} while (strlen(line) == 0 || line[0] == '#');
 
-	i = 0;
-	while (strlen(line) > 0 && i < 20) {
-		line = parseNextToken(line, _tokens[i], 40, " \t\n");
-		if (_tokens[i][0] == '"' && _tokens[i][strlen(_tokens[i]) - 1] != '"') {
-
-			line = parseNextToken(line, _tokens[i+1], 40, "\"");
-			strcat(_tokens[i], _tokens[i+1]);
-			_tokens[i][0] = ' ';
-			line++;
-
-		}
-
-		line = Common::ltrim(line);
-		i++;
-	}
-
-	return i;
+	return fillTokens(line);
 }