[Scummvm-cvs-logs] scummvm master -> 6da0549133012b9e01741b7c81a2db234718260e

[lordhoto]

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:
6da0549133 KYRA: Fix minor bug in AdLibDriver::primaryEffect1.


Commit: 6da0549133012b9e01741b7c81a2db234718260e
    https://github.com/scummvm/scummvm/commit/6da0549133012b9e01741b7c81a2db234718260e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-10-01T17:17:59-07:00

Commit Message:
KYRA: Fix minor bug in AdLibDriver::primaryEffect1.

Changed paths:
    engines/kyra/sound_adlib.cpp



diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index b71c2f7..8976eba 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -1118,11 +1118,11 @@ void AdLibDriver::primaryEffect1(Channel &channel) {
 		return;
 
 	// Initialize unk1 to the current frequency
-	uint16 unk1 = ((channel.regBx & 3) << 8) | channel.regAx;
+	int16 unk1 = ((channel.regBx & 3) << 8) | channel.regAx;
 
 	// This is presumably to shift the "note on" bit so far to the left
 	// that it won't be affected by any of the calculations below.
-	uint16 unk2 = ((channel.regBx & 0x20) << 8) | (channel.regBx & 0x1C);
+	int16 unk2 = ((channel.regBx & 0x20) << 8) | (channel.regBx & 0x1C);
 
 	int16 unk3 = (int16)channel.unk30;