diff options
| author | Oystein Eftevaag | 2006-03-18 14:55:29 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2006-03-18 14:55:29 +0000 |
| commit | 74aa77114317cd4aef82d6f1e4b4bfa82dd59f00 (patch) | |
| tree | e2fc929aa0cb98f5376aa1125d469a1d75c91ff7 | |
| parent | f9f2cd2dbee9988097ecb3fe9f55d7f7d2c1fbbe (diff) | |
| download | scummvm-rg350-74aa77114317cd4aef82d6f1e4b4bfa82dd59f00.tar.gz scummvm-rg350-74aa77114317cd4aef82d6f1e4b4bfa82dd59f00.tar.bz2 scummvm-rg350-74aa77114317cd4aef82d6f1e4b4bfa82dd59f00.zip | |
Changed 'amiga' keywords to 'isAmiga' in the resource handling code to avoid #define conflicts
svn-id: r21366
| -rw-r--r-- | engines/kyra/resource.cpp | 8 | ||||
| -rw-r--r-- | engines/kyra/resource.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 4e95ba1db1..fe0f1850ab 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -230,9 +230,9 @@ bool Resource::fileHandle(const char *file, uint32 *size, Common::File &filehand /////////////////////////////////////////// // Pak file manager #define PAKFile_Iterate Common::List<PakChunk*>::iterator start=_files.begin();start != _files.end(); ++start -PAKFile::PAKFile(const Common::String& file, bool amiga) { +PAKFile::PAKFile(const Common::String& file, bool isAmiga) { _filename = 0; - _amiga = amiga; + _isAmiga = isAmiga; Common::File pakfile; uint8 *buffer = 0; @@ -253,7 +253,7 @@ PAKFile::PAKFile(const Common::String& file, bool amiga) { // works with the file uint32 pos = 0, startoffset = 0, endoffset = 0; - if (!_amiga) { + if (!_isAmiga) { startoffset = READ_LE_UINT32(buffer + pos); } else { startoffset = READ_BE_UINT32(buffer + pos); @@ -272,7 +272,7 @@ PAKFile::PAKFile(const Common::String& file, bool amiga) { if (!(*chunk->_name)) break; - if (!_amiga) { + if (!_isAmiga) { endoffset = READ_LE_UINT32(buffer + pos); } else { endoffset = READ_BE_UINT32(buffer + pos); diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 6520fe609f..261a91c6da 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -43,7 +43,7 @@ class PAKFile { public: - PAKFile(const Common::String &file, bool amiga = false); + PAKFile(const Common::String &file, bool isAmiga = false); ~PAKFile(); uint8* getFile(const char *file); |