thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup for MemoryReadStream; made it match the File-class interface

Browse source 
svn-id: r14086
This commit is contained in:
Max Horn 2004-06-27 21:30:33 +00:00
parent 4b2d863924
commit a1b82d8e13
8 changed files with 53 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

8
saga/script.cpp
View file

@ -104,12 +104,12 @@ int SCRIPT_Init() {
// Convert LUT resource to logical LUT
MemoryReadStream *readS = new MemoryReadStream(rsc_ptr, rsc_len);
for (i = 0; i < ScriptModule.script_lut_max; i++) {
prevTell = readS->tell();
prevTell = readS->pos();
ScriptModule.script_lut[i].script_rn = readS->readUint16LE();
ScriptModule.script_lut[i].diag_list_rn = readS->readUint16LE();
ScriptModule.script_lut[i].voice_lut_rn = readS->readUint16LE();
// Skip the unused portion of the structure
for (j = readS->tell(); j < prevTell + ScriptModule.script_lut_entrylen; j++)
for (j = readS->pos(); j < prevTell + ScriptModule.script_lut_entrylen; j++)
readS->readByte();
}
@ -365,7 +365,7 @@ R_SCRIPT_BYTECODE *SCRIPT_LoadBytecode(byte *bytecode_p, size_t bytecode_len) {
// Read in the entrypoint table
while (readS->tell() < ep_tbl_offset)
while (readS->pos() < ep_tbl_offset)
readS->readByte();
for (i = 0; i < n_entrypoints; i++) {
@ -439,7 +439,7 @@ R_DIALOGUE_LIST *SCRIPT_LoadDialogue(const byte *dialogue_p, size_t dialogue_len
}
// Read in tables from dialogue list resource
readS->rewind();
readS->seek(0);
for (i = 0; i < n_dialogue; i++) {
offset = readS->readUint16LE();
if (offset > dialogue_len) {