[Scummvm-cvs-logs] scummvm master -> 134aa5af09053d88cd068b424b4e9b14e15d3df6

wjp wjp at usecode.org
Fri Oct 3 01:20:59 CEST 2014


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:
134aa5af09 SCI: Fix reading SCI1 midi channel flags


Commit: 134aa5af09053d88cd068b424b4e9b14e15d3df6
    https://github.com/scummvm/scummvm/commit/134aa5af09053d88cd068b424b4e9b14e15d3df6
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-10-03T01:19:01+02:00

Commit Message:
SCI: Fix reading SCI1 midi channel flags

Thanks waltervn

Changed paths:
    engines/sci/resource_audio.cpp



diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 4c7cd9b..66778f0 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -710,7 +710,6 @@ SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVers
 
 						// 0x20 is set on rhythm channels to prevent remapping
 						// CHECKME: Which SCI versions need that set manually?
-						channel->flags = (*channel->data) >> 4;
 						if (channel->number == 9)
 							channel->flags |= 2;
 						// Note: flag 1: channel start offset is 0 instead of 10






More information about the Scummvm-git-logs mailing list