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 /simon/res.cpp | |
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 'simon/res.cpp')
-rw-r--r-- | simon/res.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/simon/res.cpp b/simon/res.cpp index 0174a8ba17..c7a6a76127 100644 --- a/simon/res.cpp +++ b/simon/res.cpp @@ -97,7 +97,7 @@ static const char *const opcode_arg_table_simon2dos[256] = { }; void SimonEngine::loadGamePcFile(const char *filename) { - File in; + Common::File in; int num_inited_objects; int i, file_size; @@ -164,7 +164,7 @@ void SimonEngine::loadGamePcFile(const char *filename) { in.close(); } -void SimonEngine::readGamePcText(File *in) { +void SimonEngine::readGamePcText(Common::File *in) { uint text_size; byte *text_mem; @@ -178,7 +178,7 @@ void SimonEngine::readGamePcText(File *in) { setupStringTable(text_mem, _stringTabNum); } -void SimonEngine::readItemFromGamePc(File *in, Item *item) { +void SimonEngine::readItemFromGamePc(Common::File *in, Item *item) { uint32 type; item->unk2 = in->readUint16BE(); @@ -199,7 +199,7 @@ void SimonEngine::readItemFromGamePc(File *in, Item *item) { } } -void SimonEngine::readItemChildren(File *in, Item *item, uint type) { +void SimonEngine::readItemChildren(Common::File *in, Item *item, uint type) { if (type == 1) { uint fr1 = in->readUint16BE(); uint fr2 = in->readUint16BE(); @@ -246,14 +246,14 @@ void SimonEngine::readItemChildren(File *in, Item *item, uint type) { } } -uint fileReadItemID(File *in) { +uint fileReadItemID(Common::File *in) { uint32 val = in->readUint32BE(); if (val == 0xFFFFFFFF) return 0; return val + 2; } -byte *SimonEngine::readSingleOpcode(File *in, byte *ptr) { +byte *SimonEngine::readSingleOpcode(Common::File *in, byte *ptr) { int i, l; const char *string_ptr; uint val; |