diff options
author | Strangerke | 2011-07-23 14:31:39 +0200 |
---|---|---|
committer | Strangerke | 2011-07-23 14:31:39 +0200 |
commit | c728a53148d436cfebb33d58a75f3146980a39e0 (patch) | |
tree | 327b58625f9df0d80aef48d871df7ea1339549d7 /engines/cge/general.cpp | |
parent | 3ef0558aa933ce20242b3f842c235f792a6d2d32 (diff) | |
download | scummvm-rg350-c728a53148d436cfebb33d58a75f3146980a39e0.tar.gz scummvm-rg350-c728a53148d436cfebb33d58a75f3146980a39e0.tar.bz2 scummvm-rg350-c728a53148d436cfebb33d58a75f3146980a39e0.zip |
CGE: Rename IOMode and SnCom enums
Diffstat (limited to 'engines/cge/general.cpp')
-rw-r--r-- | engines/cge/general.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/engines/cge/general.cpp b/engines/cge/general.cpp index 8639c66653..909c517c32 100644 --- a/engines/cge/general.cpp +++ b/engines/cge/general.cpp @@ -206,15 +206,15 @@ char *dwtom(uint32 val, char *str, int radix, int len) { return str; } -IoHand::IoHand(IOMODE mode, CRYPT *crpt) - : XFile(mode), _crypt(crpt), _seed(SEED) { +IoHand::IoHand(IOMode mode, CRYPT *crpt) + : XFile(mode), _crypt(crpt), _seed(kCryptSeed) { _file = new Common::File(); } -IoHand::IoHand(const char *name, IOMODE mode, CRYPT *crpt) - : XFile(mode), _crypt(crpt), _seed(SEED) { +IoHand::IoHand(const char *name, IOMode mode, CRYPT *crpt) + : XFile(mode), _crypt(crpt), _seed(kCryptSeed) { // TODO: Check if WRI and/or UPD modes are needed, and map to a save file - assert(mode == REA); + assert(mode == kModeRead); _file = new Common::File(); _file->open(name); @@ -226,7 +226,7 @@ IoHand::~IoHand() { } uint16 IoHand::read(void *buf, uint16 len) { - if (_mode == WRI || !_file->isOpen()) + if (_mode == kModeWrite || !_file->isOpen()) return 0; uint16 bytesRead = _file->read(buf, len); @@ -242,7 +242,7 @@ uint16 IoHand::write(void *buf, uint16 len) { return 0; /* if (len) { - if (Mode == REA || Handle < 0) + if (Mode == kModeRead || Handle < 0) return 0; if (Crypt) Seed = Crypt(buf, len, Seed); @@ -333,7 +333,6 @@ int new_random(int range) { return ((CGEEngine *)g_engine)->_randomSource.getRandomNumber(range - 1); } -#define TIMER_INT 0x08 //void interrupt (* Engine_::oldTimer) (...) = NULL; Engine_::Engine_(uint16 tdiv) { |