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

experimental support for the V2 resource format (patch #601560)

Browse source 
svn-id: r4864
This commit is contained in:
Max Horn 2002-08-29 16:57:43 +00:00
parent 0cf920e040
commit bbcae3efbe
7 changed files with 117 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scumm/resource.cpp
View file

@ -388,8 +388,10 @@ void Scumm::readResTypeList(int id, uint32 tag, const char *name)
if (_features & GF_AFTER_V8)
num = fileReadDwordLE();
else
else if (!(_features & GF_OLD_BUNDLE))
num = fileReadWordLE();
else
num = fileReadByte();
if (1 || _features & GF_AFTER_V6) {
if (num != res.num[id]) {
@ -402,7 +404,18 @@ void Scumm::readResTypeList(int id, uint32 tag, const char *name)
allocResTypeData(id, tag, num, name, 1);
}
if (_features & GF_SMALL_HEADER) {
if (_features & GF_OLD_BUNDLE) {
if (id == rtRoom){
for (i = 0; i < num; i++)
res.roomno[id][i] = i;
fileSeek(_fileHandle, num, SEEK_CUR);
} else {
for (i = 0; i < num; i++)
res.roomno[id][i] = fileReadByte();
}
for (i = 0; i < num; i++)
res.roomoffs[id][i] = fileReadWordLE();
} else if (_features & GF_SMALL_HEADER) {
for (i = 0; i < num; i++) {
res.roomno[id][i] = fileReadByte();
res.roomoffs[id][i] = fileReadDword();
@ -530,7 +543,9 @@ int Scumm::loadResource(int type, int idx)
fileSeek(_fileHandle, fileOffs + _fileOffset, SEEK_SET);
if (_features & GF_SMALL_HEADER) {
if (_features & GF_OLD_BUNDLE) {
size = fileReadWordLE();
} else if (_features & GF_SMALL_HEADER) {
if (!(_features & GF_SMALL_NAMES))
fileSeek(_fileHandle, 8, SEEK_CUR);
size = fileReadDwordLE();