diff options
author | uruk | 2014-05-08 18:32:29 +0200 |
---|---|---|
committer | uruk | 2014-05-08 18:32:29 +0200 |
commit | 12a9d0a759fd0129ced1f8815d1da569cd4378c2 (patch) | |
tree | 308bdb0fc219127e61150d2f3dbbe9eb20cb9368 /engines | |
parent | 72cccb80008979ed4f23404681df173d007f34ed (diff) | |
download | scummvm-rg350-12a9d0a759fd0129ced1f8815d1da569cd4378c2.tar.gz scummvm-rg350-12a9d0a759fd0129ced1f8815d1da569cd4378c2.tar.bz2 scummvm-rg350-12a9d0a759fd0129ced1f8815d1da569cd4378c2.zip |
CGE2: Add kIdTab and _lineCount to EncryptedStream.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/cge2/fileio.cpp | 9 | ||||
-rw-r--r-- | engines/cge2/fileio.h | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/engines/cge2/fileio.cpp b/engines/cge2/fileio.cpp index 7677699fed..6cc9f8b8de 100644 --- a/engines/cge2/fileio.cpp +++ b/engines/cge2/fileio.cpp @@ -181,7 +181,7 @@ uint16 ResourceManager::catRead(byte *buf, uint16 length) { /*----------------------------------------------------------------------- * EncryptedStream *-----------------------------------------------------------------------*/ -EncryptedStream::EncryptedStream(CGE2Engine *vm, const char *name) : _vm(vm) { +EncryptedStream::EncryptedStream(CGE2Engine *vm, const char *name) : _vm(vm), _lineCount(0) { _error = false; BtKeypack *kp = _vm->_resman->find(name); if (scumm_stricmp(kp->_key, name) != 0) @@ -229,6 +229,7 @@ bool EncryptedStream::seek(int32 offset) { } Common::String EncryptedStream::readLine() { + _lineCount++; return _readStream->readLine(); } @@ -256,4 +257,10 @@ EncryptedStream::~EncryptedStream() { delete _readStream; } +const char *EncryptedStream::kIdTab[] = { + "[near]", "[mtake]", "[ftake]", "[phase]", "[seq]", + "Name", "Type", "Front", "East", + "Portable", "Transparent", + NULL }; + } // End of namespace CGE2 diff --git a/engines/cge2/fileio.h b/engines/cge2/fileio.h index a596d71341..0d32cab3c2 100644 --- a/engines/cge2/fileio.h +++ b/engines/cge2/fileio.h @@ -102,7 +102,11 @@ class EncryptedStream { private: CGE2Engine *_vm; Common::SeekableReadStream *_readStream; + const char **_tab; + int _lineCount; bool _error; + + static const char *kIdTab[]; public: EncryptedStream(CGE2Engine *vm, const char *name); ~EncryptedStream(); @@ -115,6 +119,7 @@ public: Common::String readLine(); static int number(char *s); static char *token(char *s); + int getLineCount() { return _lineCount; } }; } // End of namespace CGE2 |