aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/resource.cpp
diff options
context:
space:
mode:
authorMax Horn2007-12-24 14:20:53 +0000
committerMax Horn2007-12-24 14:20:53 +0000
commit138263ec035bc7a38fe49aa7296adfaa6d0bf6e1 (patch)
tree7774080c41c96bf1041c7fc607a70277cac9122a /engines/scumm/resource.cpp
parent50cf084a6b992c588cd8c9da9c175dc907335544 (diff)
downloadscummvm-rg350-138263ec035bc7a38fe49aa7296adfaa6d0bf6e1.tar.gz
scummvm-rg350-138263ec035bc7a38fe49aa7296adfaa6d0bf6e1.tar.bz2
scummvm-rg350-138263ec035bc7a38fe49aa7296adfaa6d0bf6e1.zip
cleanup
svn-id: r29974
Diffstat (limited to 'engines/scumm/resource.cpp')
-rw-r--r--engines/scumm/resource.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 4042ade9b4..698cdd61ed 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -632,7 +632,7 @@ int ScummEngine::loadResource(int type, int idx) {
if (type == rtCharset && (_game.features & GF_SMALL_HEADER)) {
loadCharset(idx);
- return (1);
+ return 1;
}
roomNr = getResourceRoomNr(type, idx);
@@ -662,7 +662,7 @@ int ScummEngine::loadResource(int type, int idx) {
if (_game.features & GF_OLD_BUNDLE) {
if ((_game.version == 3) && !(_game.platform == Common::kPlatformAmiga) && (type == rtSound)) {
- return readSoundResourceSmallHeader(type, idx);
+ return readSoundResourceSmallHeader(idx);
} else {
size = _fileHandle->readUint16LE();
_fileHandle->seek(-2, SEEK_CUR);
@@ -674,11 +674,11 @@ int ScummEngine::loadResource(int type, int idx) {
tag = _fileHandle->readUint16LE();
_fileHandle->seek(-6, SEEK_CUR);
if ((type == rtSound) && !(_game.platform == Common::kPlatformAmiga) && !(_game.platform == Common::kPlatformFMTowns)) {
- return readSoundResourceSmallHeader(type, idx);
+ return readSoundResourceSmallHeader(idx);
}
} else {
if (type == rtSound) {
- return readSoundResource(type, idx);
+ return readSoundResource(idx);
}
tag = _fileHandle->readUint32BE();