SCUMM: cleanup (moved small header specific code from ScummEngine::readResTypeList to ScummEngine_v4::readResTypeList)
svn-id: r25827
This commit is contained in:
parent
dcc6e2c0bb
commit
04a18dd7c4
3 changed files with 32 additions and 18 deletions
|
@ -512,26 +512,19 @@ void ScummEngine::readResTypeList(int id, const char *name) {
|
|||
error("Invalid number of %ss (%d) in directory", name, num);
|
||||
}
|
||||
|
||||
if (_game.features & GF_SMALL_HEADER) {
|
||||
for (i = 0; i < num; i++) {
|
||||
_res->roomno[id][i] = _fileHandle->readByte();
|
||||
_res->roomoffs[id][i] = _fileHandle->readUint32LE();
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < num; i++) {
|
||||
_res->roomno[id][i] = _fileHandle->readByte();
|
||||
}
|
||||
for (i = 0; i < num; i++) {
|
||||
_res->roomoffs[id][i] = _fileHandle->readUint32LE();
|
||||
for (i = 0; i < num; i++) {
|
||||
_res->roomno[id][i] = _fileHandle->readByte();
|
||||
}
|
||||
for (i = 0; i < num; i++) {
|
||||
_res->roomoffs[id][i] = _fileHandle->readUint32LE();
|
||||
|
||||
if (id == rtRoom && _game.heversion >= 70)
|
||||
_heV7RoomIntOffsets[i] = _res->roomoffs[id][i];
|
||||
}
|
||||
if (id == rtRoom && _game.heversion >= 70)
|
||||
_heV7RoomIntOffsets[i] = _res->roomoffs[id][i];
|
||||
}
|
||||
|
||||
if (_game.heversion >= 70) {
|
||||
for (i = 0; i < num; i++) {
|
||||
_res->globsize[id][i] = _fileHandle->readUint32LE();
|
||||
}
|
||||
if (_game.heversion >= 70) {
|
||||
for (i = 0; i < num; i++) {
|
||||
_res->globsize[id][i] = _fileHandle->readUint32LE();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue