libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed 'amiga' keywords to 'isAmiga' in the resource handling code to avoid #define conflicts

Browse Source 
svn-id: r21366
This commit is contained in:
Oystein Eftevaag 2006-03-18 14:55:29 +00:00
parent f9f2cd2dbe
commit 74aa771143
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/kyra/resource.cpp
View File

@ -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);

2
engines/kyra/resource.h
View File

@ -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);