[Scummvm-cvs-logs] CVS: scummvm/kyra resource.cpp,1.10,1.11

[Max Horn]

Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17315/kyra

Modified Files:
	resource.cpp 
Log Message:
Moved class File and the MD5 stuff to namespace Common

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/resource.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- resource.cpp	8 May 2005 21:49:42 -0000	1.10
+++ resource.cpp	10 May 2005 22:55:48 -0000	1.11
@@ -90,7 +90,7 @@
 	
 uint8* Resourcemanager::fileData(const char* file, uint32* size) {
 	uint8* buffer = 0;
-	File file_;
+	Common::File file_;
 		
 	// test to open it in the main dir
 	if (file_.open(file)) {
@@ -183,11 +183,11 @@
 // Pak file manager
 #define PAKFile_Iterate Common::List<PakChunk*>::iterator start=_files.begin();start != _files.end(); ++start
 PAKFile::PAKFile(/*const Common::String &path, */const Common::String& file) {
-	File pakfile;
+	Common::File pakfile;
 	_buffer = 0;
 	_open = false;
 		
-	if (!pakfile.open(file.c_str())){ /*, File::kFileReadMode, path.c_str())) {*/
+	if (!pakfile.open(file.c_str())){ /*, Common::File::kFileReadMode, path.c_str())) {*/
 		printf("pakfile couldn't open %s\n", file.c_str());
 		return;
 	}