aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction
diff options
context:
space:
mode:
authorNicola Mettifogo2008-08-14 07:14:34 +0000
committerNicola Mettifogo2008-08-14 07:14:34 +0000
commit5cfa50f02839dd34a3f600f36000b989c614c5b2 (patch)
treedd3e74ae224f7fb707921b214b900f78823ee53a /engines/parallaction
parent4a46c99026b4287c8cbb69d60a4ddeb3f8026bd7 (diff)
downloadscummvm-rg350-5cfa50f02839dd34a3f600f36000b989c614c5b2.tar.gz
scummvm-rg350-5cfa50f02839dd34a3f600f36000b989c614c5b2.tar.bz2
scummvm-rg350-5cfa50f02839dd34a3f600f36000b989c614c5b2.zip
Finally moved parseNextToken to Script, where it belongs!
svn-id: r33859
Diffstat (limited to 'engines/parallaction')
-rw-r--r--engines/parallaction/parser.cpp2
-rw-r--r--engines/parallaction/parser.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/parallaction/parser.cpp b/engines/parallaction/parser.cpp
index 97caa9dc6c..8e30a631e4 100644
--- a/engines/parallaction/parser.cpp
+++ b/engines/parallaction/parser.cpp
@@ -93,7 +93,7 @@ void Script::skip(const char* endToken) {
//
// The routine returns the unparsed portion of the input string 's'.
//
-char *parseNextToken(char *s, char *tok, uint16 count, const char *brk, bool ignoreQuotes) {
+char *Script::parseNextToken(char *s, char *tok, uint16 count, const char *brk, bool ignoreQuotes) {
enum STATES { NORMAL, QUOTED };
diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h
index 7e7937fb19..5a01282e37 100644
--- a/engines/parallaction/parser.h
+++ b/engines/parallaction/parser.h
@@ -32,8 +32,6 @@
namespace Parallaction {
-char *parseNextToken(char *s, char *tok, uint16 count, const char *brk, bool ignoreQuotes = false);
-
#define MAX_TOKEN_LEN 50
extern int _numTokens;
extern char _tokens[][MAX_TOKEN_LEN];
@@ -46,6 +44,7 @@ class Script {
void clearTokens();
uint16 fillTokens(char* line);
+ char *parseNextToken(char *s, char *tok, uint16 count, const char *brk, bool ignoreQuotes = false);
public:
Script(Common::ReadStream *, bool _disposeSource = false);