[Scummvm-cvs-logs] SF.net SVN: scummvm: [21366] scummvm/trunk/engines/kyra
vinterstum at users.sourceforge.net
vinterstum at users.sourceforge.net
Sat Mar 18 06:56:02 CET 2006
Revision: 21366
Author: vinterstum
Date: 2006-03-18 06:55:29 -0800 (Sat, 18 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21366&view=rev
Log Message:
-----------
Changed 'amiga' keywords to 'isAmiga' in the resource handling code to avoid #define conflicts
Modified Paths:
--------------
scummvm/trunk/engines/kyra/resource.cpp
scummvm/trunk/engines/kyra/resource.h
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2006-03-18 14:43:18 UTC (rev 21365)
+++ scummvm/trunk/engines/kyra/resource.cpp 2006-03-18 14:55:29 UTC (rev 21366)
@@ -230,9 +230,9 @@
///////////////////////////////////////////
// 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 @@
// 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 @@
if (!(*chunk->_name))
break;
- if (!_amiga) {
+ if (!_isAmiga) {
endoffset = READ_LE_UINT32(buffer + pos);
} else {
endoffset = READ_BE_UINT32(buffer + pos);
Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h 2006-03-18 14:43:18 UTC (rev 21365)
+++ scummvm/trunk/engines/kyra/resource.h 2006-03-18 14:55:29 UTC (rev 21366)
@@ -43,7 +43,7 @@
public:
- PAKFile(const Common::String &file, bool amiga = false);
+ PAKFile(const Common::String &file, bool isAmiga = false);
~PAKFile();
uint8* getFile(const char *file);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list