diff options
| author | Sven Hesse | 2010-10-31 20:07:14 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-10-31 20:07:14 +0000 |
| commit | 16a3cc8a8440c4ca6b45b6408d7baf7e9c001553 (patch) | |
| tree | c1c208521c0098bbec5fc3a19e5ad27076a66e2d /engines/gob/inter_v6.cpp | |
| parent | 88892dc982362cdaae8fa67fec7600041375fbd9 (diff) | |
| download | scummvm-rg350-16a3cc8a8440c4ca6b45b6408d7baf7e9c001553.tar.gz scummvm-rg350-16a3cc8a8440c4ca6b45b6408d7baf7e9c001553.tar.bz2 scummvm-rg350-16a3cc8a8440c4ca6b45b6408d7baf7e9c001553.zip | |
GOB: Clean up class DataIO
Removing the need for class DataStream and that handle mess.
svn-id: r53984
Diffstat (limited to 'engines/gob/inter_v6.cpp')
| -rw-r--r-- | engines/gob/inter_v6.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index e1eff279b5..b6884c6fbe 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -191,16 +191,16 @@ void Inter_v6::o6_openItk() { if (!strchr(fileName, '.')) strcat(fileName, ".ITK"); - _vm->_dataIO->openDataFile(fileName, true); + _vm->_dataIO->openArchive(fileName, false); // WORKAROUND: The CD number detection in Urban Runner is quite daft // (it checks CD1.ITK - CD4.ITK and the first that's found determines // the CD number), while its NO_CD modus wants everything in CD1.ITK. // So we just open the other ITKs, too. if (_vm->_global->_noCd && !scumm_stricmp(fileName, "CD1.ITK")) { - _vm->_dataIO->openDataFile("CD2.ITK", true); - _vm->_dataIO->openDataFile("CD3.ITK", true); - _vm->_dataIO->openDataFile("CD4.ITK", true); + _vm->_dataIO->openArchive("CD2.ITK", false); + _vm->_dataIO->openArchive("CD3.ITK", false); + _vm->_dataIO->openArchive("CD4.ITK", false); } } @@ -439,7 +439,7 @@ void Inter_v6::probe16bitMusic(char *fileName) { fileName[len - 1] = 'V'; - if (_vm->_dataIO->existData(fileName)) + if (_vm->_dataIO->hasFile(fileName)) return; fileName[len - 1] = '8'; |