[Scummvm-cvs-logs] SF.net SVN: scummvm: [30941] scummvm/branches/branch-0-11-0/engines/kyra

[sev at users.sourceforge.net]

Revision: 30941
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30941&view=rev
Author:   sev
Date:     2008-02-23 13:21:45 -0800 (Sat, 23 Feb 2008)

Log Message:
-----------
Part of patch #1900179: "PlayStation2 ScummVM-0.11.1 patch"

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/engines/kyra/resource.cpp
    scummvm/branches/branch-0-11-0/engines/kyra/resource.h

Modified: scummvm/branches/branch-0-11-0/engines/kyra/resource.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/kyra/resource.cpp	2008-02-23 21:12:27 UTC (rev 30940)
+++ scummvm/branches/branch-0-11-0/engines/kyra/resource.cpp	2008-02-23 21:21:45 UTC (rev 30941)
@@ -331,7 +331,7 @@
 ///////////////////////////////////////////
 // Pak file manager
 PAKFile::PAKFile(const char *file, const char *physfile, Common::File &pakfile, bool isAmiga) : ResourceFile() {
-	_open = false;
+	_mopen = false;
 
 	if (!pakfile.isOpen()) {
 		debug(3, "couldn't open pakfile '%s'\n", file);
@@ -407,7 +407,7 @@
 		pos += nameLength + 4;
 	}
 
-	_open = true;
+	_mopen = true;
 	_filename = Common::hashit_lower(file);
 	_physfile = physfile;
 	_physOffset = off;
@@ -416,7 +416,7 @@
 
 PAKFile::~PAKFile() {
 	_physfile.clear();
-	_open = false;
+	_mopen = false;
 
 	_files.clear();
 }
@@ -470,7 +470,7 @@
 // Ins file manager
 INSFile::INSFile(const char *file) : ResourceFile(), _files() {
 	Common::File pakfile;
-	_open = false;
+	_mopen = false;
 
 	if (!pakfile.open(file)) {
 		debug(3, "couldn't open insfile '%s'\n", file);
@@ -521,11 +521,11 @@
 
 	_filename = Common::hashit_lower(file);
 	_physfile = file;
-	_open = true;
+	_mopen = true;
 }
 
 INSFile::~INSFile() {
-	_open = false;
+	_mopen = false;
 
 	_files.clear();
 }

Modified: scummvm/branches/branch-0-11-0/engines/kyra/resource.h
===================================================================
--- scummvm/branches/branch-0-11-0/engines/kyra/resource.h	2008-02-23 21:12:27 UTC (rev 30940)
+++ scummvm/branches/branch-0-11-0/engines/kyra/resource.h	2008-02-23 21:21:45 UTC (rev 30941)
@@ -38,7 +38,7 @@
 
 class ResourceFile {
 public:
-	ResourceFile() : _open(false), _protected(false), _filename() {}
+	ResourceFile() : _mopen(false), _protected(false), _filename() {}
 	virtual ~ResourceFile() {}
 
 	virtual uint8 *getFile(uint file) const = 0;
@@ -48,13 +48,13 @@
 	uint filename() const { return _filename; }
 
 	virtual bool isValid(void) const { return (_filename != 0); }
-	bool isOpen(void) const { return _open; }
+	bool isOpen(void) const { return _mopen; }
 
-	virtual void close() { if (!_protected) _open = false; }
+	virtual void close() { if (!_protected) _mopen = false; }
 	virtual void protect(const bool prot = true) { _protected = prot; }
-	virtual void open() { _open = true; }
+	virtual void open() { _mopen = true; }
 protected:
-	bool _open;
+	bool _mopen;
 	bool _protected;
 	uint _filename;
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.