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

Fix regression in SCI1/1.1 wave sound from r46660. I knew it was a bad omen to have that revision number :P

Browse source 
svn-id: r46664
This commit is contained in:
Matthew Hoops 2009-12-27 23:35:22 +00:00
parent 538806af19
commit fedd4f1076
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sci/resource.cpp
View file

@ -193,7 +193,7 @@ ResourceSource *ResourceManager::getVolume(ResourceSource *map, int volume_nr) {
bool ResourceManager::loadPatch(Resource *res, Common::File &file) { bool ResourceManager::loadPatch(Resource *res, Common::File &file) {
// We assume that the resource type matches res->type // We assume that the resource type matches res->type
file.seek(res->file_offset, SEEK_SET); file.seek(res->file_offset + 2, SEEK_SET);
res->data = new byte[res->size]; res->data = new byte[res->size];
@ -944,7 +944,7 @@ void ResourceManager::processPatch(ResourceSource *source, ResourceType restype,
newrsc->source = source; newrsc->source = source;
newrsc->size = fsize - patch_data_offset - 2; newrsc->size = fsize - patch_data_offset - 2;
newrsc->headerSize = patch_data_offset; newrsc->headerSize = patch_data_offset;
newrsc->file_offset = 2; newrsc->file_offset = 0;
debugC(1, kDebugLevelResMan, "Patching %s - OK", source->location_name.c_str()); debugC(1, kDebugLevelResMan, "Patching %s - OK", source->location_name.c_str());
} }
@ -1034,7 +1034,7 @@ void ResourceManager::readWaveAudioPatches() {
newrsc->source = psrcPatch; newrsc->source = psrcPatch;
newrsc->size = fileSize; newrsc->size = fileSize;
newrsc->headerSize = 0; newrsc->headerSize = 0;
newrsc->file_offset = 0; // No patch header newrsc->file_offset = -2; // Use -2 to signal there's no patch header
debugC(1, kDebugLevelResMan, "Patching %s - OK", psrcPatch->location_name.c_str()); debugC(1, kDebugLevelResMan, "Patching %s - OK", psrcPatch->location_name.c_str());
} }
} }

2
engines/sci/resource.h
View file

@ -204,7 +204,7 @@ public:
byte *header; byte *header;
uint32 headerSize; uint32 headerSize;
protected: protected:
uint32 file_offset; /**< Offset in file */ int32 file_offset; /**< Offset in file */
ResourceStatus status; ResourceStatus status;
uint16 lockers; /**< Number of places where this resource was locked */ uint16 lockers; /**< Number of places where this resource was locked */
ResourceSource *source; ResourceSource *source;