diff options
Diffstat (limited to 'engines/agos/subroutine.cpp')
-rw-r--r-- | engines/agos/subroutine.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp index 8dccded958..076e562a76 100644 --- a/engines/agos/subroutine.cpp +++ b/engines/agos/subroutine.cpp @@ -30,8 +30,6 @@ #include "agos/agos.h" #include "agos/intern.h" -using Common::File; - namespace AGOS { // Script opcodes to load into memory @@ -262,22 +260,22 @@ void AGOSEngine::endCutscene() { _runScriptReturn1 = true; } -File *AGOSEngine::openTablesFile(const char *filename) { +Common::File *AGOSEngine::openTablesFile(const char *filename) { if (getFeatures() & GF_OLD_BUNDLE) return openTablesFile_simon1(filename); else return openTablesFile_gme(filename); } -File *AGOSEngine::openTablesFile_simon1(const char *filename) { - File *fo = new File(); +Common::File *AGOSEngine::openTablesFile_simon1(const char *filename) { + Common::File *fo = new Common::File(); fo->open(filename); if (fo->isOpen() == false) error("openTablesFile: Can't open '%s'", filename); return fo; } -File *AGOSEngine::openTablesFile_gme(const char *filename) { +Common::File *AGOSEngine::openTablesFile_gme(const char *filename) { uint res; uint32 offs; @@ -291,7 +289,7 @@ File *AGOSEngine::openTablesFile_gme(const char *filename) { bool AGOSEngine::loadTablesIntoMem(uint16 subrId) { byte *p; uint16 min_num, max_num, file_num; - File *in; + Common::File *in; char filename[30]; if (_tblList == NULL) @@ -340,7 +338,7 @@ bool AGOSEngine::loadTablesIntoMem(uint16 subrId) { bool AGOSEngine_Waxworks::loadTablesIntoMem(uint16 subrId) { byte *p; uint min_num, max_num; - File *in; + Common::File *in; p = _tblList; if (p == NULL) @@ -407,7 +405,7 @@ bool AGOSEngine::loadXTablesIntoMem(uint16 subrId) { int i; uint min_num, max_num; char filename[30]; - File *in; + Common::File *in; p = _xtblList; if (p == NULL) @@ -457,7 +455,7 @@ bool AGOSEngine::loadXTablesIntoMem(uint16 subrId) { return 0; } -void AGOSEngine::closeTablesFile(File *in) { +void AGOSEngine::closeTablesFile(Common::File *in) { if (getFeatures() & GF_OLD_BUNDLE) { in->close(); delete in; |