diff options
| author | Max Horn | 2005-05-10 22:56:25 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-10 22:56:25 +0000 |
| commit | b75c969e666b9f262a05e0d1e54d56f7d3e45441 (patch) | |
| tree | e4868d14ac249a63e01f905472ec9be69f04a028 /kyra | |
| parent | 55c37c18ceed916eb3744666d3d10783b0cf8783 (diff) | |
| download | scummvm-rg350-b75c969e666b9f262a05e0d1e54d56f7d3e45441.tar.gz scummvm-rg350-b75c969e666b9f262a05e0d1e54d56f7d3e45441.tar.bz2 scummvm-rg350-b75c969e666b9f262a05e0d1e54d56f7d3e45441.zip | |
Moved class File and the MD5 stuff to namespace Common
svn-id: r18037
Diffstat (limited to 'kyra')
| -rw-r--r-- | kyra/resource.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kyra/resource.cpp b/kyra/resource.cpp index f661b979ed..e93814a79f 100644 --- a/kyra/resource.cpp +++ b/kyra/resource.cpp @@ -90,7 +90,7 @@ Resourcemanager::~Resourcemanager() { 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 @@ VMContext* Resourcemanager::loadScript(const char* file) { // 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; } |