diff options
author | Nicola Mettifogo | 2007-04-03 22:03:21 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-04-03 22:03:21 +0000 |
commit | e3c25e6d203d22405ed406cd063b28a1aae11074 (patch) | |
tree | 09965b9a5e25f3b00ff0a5838a3ab937c3809496 /engines/parallaction/parser.h | |
parent | 4c151928fa4cbf61f02c424fe98f7473e96e4d39 (diff) | |
download | scummvm-rg350-e3c25e6d203d22405ed406cd063b28a1aae11074.tar.gz scummvm-rg350-e3c25e6d203d22405ed406cd063b28a1aae11074.tar.bz2 scummvm-rg350-e3c25e6d203d22405ed406cd063b28a1aae11074.zip |
- added a new archive member variable to Disk, to decouple resource archives from location archives
- made Script use a stream as input with overall simplification of Disk routines
svn-id: r26379
Diffstat (limited to 'engines/parallaction/parser.h')
-rw-r--r-- | engines/parallaction/parser.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h index fa633676e0..f662d8a896 100644 --- a/engines/parallaction/parser.h +++ b/engines/parallaction/parser.h @@ -28,7 +28,6 @@ namespace Parallaction { -void parseInit(char *s); char *parseNextLine(char *s, uint16 count); uint16 fillBuffers(Common::SeekableReadStream &stream, bool errorOnEOF = false); char *parseNextToken(char *s, char *tok, uint16 count, const char *brk); @@ -37,12 +36,11 @@ extern char _tokens[][40]; class Script : public Common::SeekableReadStream { - const char* const _src; + Common::SeekableReadStream *_input; bool _disposeSource; - char* _pos; public: - Script(const char* s, bool _disposeSource = false); + Script(Common::SeekableReadStream *, bool _disposeSource = false); ~Script(); uint32 read(void *dataPtr, uint32 dataSize); |