diff options
author | David Corrales | 2007-06-23 18:51:33 +0000 |
---|---|---|
committer | David Corrales | 2007-06-23 18:51:33 +0000 |
commit | cacd7a28fd51d960947de88abbf30c487e66529d (patch) | |
tree | f3baa59853bfb307e452b86b9d93c4737b1fa6ab /engines/agos/subroutine.cpp | |
parent | 0ac96302fe9c04df79cb01a77d19535b45fe2db0 (diff) | |
parent | 90c2210dae8c91fa8babc6b05564e15c9d445d18 (diff) | |
download | scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.gz scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.bz2 scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.zip |
Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
Diffstat (limited to 'engines/agos/subroutine.cpp')
-rw-r--r-- | engines/agos/subroutine.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp index a92f01db2b..f4a6ba3266 100644 --- a/engines/agos/subroutine.cpp +++ b/engines/agos/subroutine.cpp @@ -288,7 +288,7 @@ File *AGOSEngine::openTablesFile_gme(const char *filename) { return _gameFile; } -bool AGOSEngine::loadTablesIntoMem(uint subr_id) { +bool AGOSEngine::loadTablesIntoMem(uint16 subr_id) { byte *p; uint16 min_num, max_num, file_num; File *in; @@ -337,7 +337,7 @@ bool AGOSEngine::loadTablesIntoMem(uint subr_id) { return 0; } -bool AGOSEngine_Waxworks::loadTablesIntoMem(uint subr_id) { +bool AGOSEngine_Waxworks::loadTablesIntoMem(uint16 subr_id) { byte *p; int i; uint min_num, max_num; @@ -399,7 +399,7 @@ bool AGOSEngine_Waxworks::loadTablesIntoMem(uint subr_id) { return 0; } -bool AGOSEngine::loadXTablesIntoMem(uint subr_id) { +bool AGOSEngine::loadXTablesIntoMem(uint16 subr_id) { byte *p; int i; uint min_num, max_num; @@ -461,7 +461,7 @@ void AGOSEngine::closeTablesFile(File *in) { } } -Subroutine *AGOSEngine::createSubroutine(uint id) { +Subroutine *AGOSEngine::createSubroutine(uint16 id) { Subroutine *sub; alignTableMem(); @@ -681,7 +681,7 @@ void AGOSEngine::readSubroutineLine(Common::SeekableReadStream *in, SubroutineLi byte *AGOSEngine::readSingleOpcode(Common::SeekableReadStream *in, byte *ptr) { int i, l; const char *string_ptr; - uint opcode, val; + uint16 opcode, val; const char *const *table; |