[Scummvm-cvs-logs] SF.net SVN: scummvm:[52666] scummvm/trunk/engines/sci
waltervn at users.sourceforge.net
waltervn at users.sourceforge.net
Fri Sep 10 01:01:51 CEST 2010
Revision: 52666
http://scummvm.svn.sourceforge.net/scummvm/?rev=52666&view=rev
Author: waltervn
Date: 2010-09-09 23:01:51 +0000 (Thu, 09 Sep 2010)
Log Message:
-----------
SCI: Fix digital track regression from r52662.
Modified Paths:
--------------
scummvm/trunk/engines/sci/resource.h
scummvm/trunk/engines/sci/resource_audio.cpp
Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h 2010-09-09 20:09:32 UTC (rev 52665)
+++ scummvm/trunk/engines/sci/resource.h 2010-09-09 23:01:51 UTC (rev 52666)
@@ -512,7 +512,6 @@
public:
struct Channel {
byte number;
- bool isRhythm;
byte poly;
uint16 prio;
uint16 size;
Modified: scummvm/trunk/engines/sci/resource_audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource_audio.cpp 2010-09-09 20:09:32 UTC (rev 52665)
+++ scummvm/trunk/engines/sci/resource_audio.cpp 2010-09-09 23:01:51 UTC (rev 52666)
@@ -664,8 +664,9 @@
channel->data = resource->data + dataOffset;
channel->size = READ_LE_UINT16(data + 4);
channel->curPos = 0;
- channel->number = *channel->data & 0xf;
- channel->isRhythm = *channel->data & 0x20;
+ // FIXME: number contains (low nibble) channel and (high nibble) flags
+ // 0x20 is set on rhythm channels to prevent remapping
+ channel->number = *channel->data;
channel->poly = *(channel->data + 1);
channel->time = channel->prev = 0;
channel->data += 2; // skip over header
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list