diff options
author | Sven Hesse | 2007-07-31 01:43:32 +0000 |
---|---|---|
committer | Sven Hesse | 2007-07-31 01:43:32 +0000 |
commit | 34292a6b586a44aa8fb9361369dddf854ce999c6 (patch) | |
tree | 4ec8a73772f15db9db8c6157d508aa3a283dbe96 /engines/gob/inter_v1.cpp | |
parent | 32d00708687d10152ebc84df86b84aaad2059478 (diff) | |
download | scummvm-rg350-34292a6b586a44aa8fb9361369dddf854ce999c6.tar.gz scummvm-rg350-34292a6b586a44aa8fb9361369dddf854ce999c6.tar.bz2 scummvm-rg350-34292a6b586a44aa8fb9361369dddf854ce999c6.zip |
Minor DataIO-cleanup
svn-id: r28349
Diffstat (limited to 'engines/gob/inter_v1.cpp')
-rw-r--r-- | engines/gob/inter_v1.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 7f5a641c1b..5d74138db1 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -2225,22 +2225,23 @@ bool Inter_v1::o1_readData(OpFuncParams ¶ms) { WRITE_VAR(1, 1); handle = _vm->_dataIO->openData(_vm->_global->_inter_resStr); if (handle >= 0) { + DataStream *stream = _vm->_dataIO->openAsStream(handle, true); + _vm->_draw->animateCursor(4); if (offset < 0) - _vm->_dataIO->seekData(handle, -offset - 1, SEEK_END); + stream->seek(-offset - 1, SEEK_END); else - _vm->_dataIO->seekData(handle, offset, SEEK_SET); + stream->seek(offset); if (((dataVar >> 2) == 59) && (size == 4)) - WRITE_VAR(59, _vm->_dataIO->readUint32(handle)); + WRITE_VAR(59, stream->readUint32LE()); else - retSize = _vm->_dataIO->readData(handle, - _vm->_global->_inter_variables + dataVar, size); - - _vm->_dataIO->closeData(handle); + retSize = stream->read(_vm->_global->_inter_variables + dataVar, size); if (retSize == size) WRITE_VAR(1, 0); + + delete stream; } if (_vm->_game->_extHandle >= 0) |