From 138263ec035bc7a38fe49aa7296adfaa6d0bf6e1 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 24 Dec 2007 14:20:53 +0000 Subject: cleanup svn-id: r29974 --- engines/scumm/resource.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/scumm/resource.cpp') 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(); -- cgit v1.2.3