[Scummvm-git-logs] scummvm master -> c788642b72ea524d720e36b28bf9e87e7b06fd28

csnover csnover at users.noreply.github.com
Tue May 9 07:26:30 CEST 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c788642b72 SCI: Add ifdef for SCI32 types in processPatch


Commit: c788642b72ea524d720e36b28bf9e87e7b06fd28
    https://github.com/scummvm/scummvm/commit/c788642b72ea524d720e36b28bf9e87e7b06fd28
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-05-09T00:26:23-05:00

Commit Message:
SCI: Add ifdef for SCI32 types in processPatch

Changed paths:
    engines/sci/resource.cpp


diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index ccf576d..91cceb5 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1485,15 +1485,17 @@ void ResourceManager::processPatch(ResourceSource *source, ResourceType resource
 			fileStream->seek(3, SEEK_SET);
 			patchDataOffset += fileStream->readByte() + kExtraHeaderSize;
 			break;
-		case kResourceTypeWave:
 		case kResourceTypeAudio:
 		case kResourceTypeAudio36:
+#ifdef ENABLE_SCI32
+		case kResourceTypeWave:
 		case kResourceTypeVMD:
 		case kResourceTypeDuck:
 		case kResourceTypeClut:
 		case kResourceTypeTGA:
 		case kResourceTypeZZZ:
 		case kResourceTypeEtc:
+#endif
 			patchDataOffset = 0;
 			break;
 		default:





More information about the Scummvm-git-logs mailing list