[Scummvm-cvs-logs] SF.net SVN: scummvm:[33935] scummvm/trunk/engines/cine/sound.cpp

[buddha_ at users.sourceforge.net]

Revision: 33935
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33935&view=rev
Author:   buddha_
Date:     2008-08-16 11:38:43 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
Changed AdlibRegisterSoundInstrument's member variables from unsigned 16-bit to unsigned 8-bit. Maybe this'll fix the crash in AdlibSoundDriver::setupInstrument() eriktorbjorn was getting in Future Wars when teleporting from the photocopier room to the swamp. There was a OPLWriteReg(_opl, 0x80 | car, reg->sustainRelease) call with sustainRelease = 65452. Now there shouldn't be any such calls made because the sustainRelease value is always 8-bit now. Hopefully this won't break anything.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/sound.cpp

Modified: scummvm/trunk/engines/cine/sound.cpp
===================================================================
--- scummvm/trunk/engines/cine/sound.cpp	2008-08-16 11:37:36 UTC (rev 33934)
+++ scummvm/trunk/engines/cine/sound.cpp	2008-08-16 11:38:43 UTC (rev 33935)
@@ -79,13 +79,13 @@
 const int PCSoundDriver::_noteTableCount = ARRAYSIZE(_noteTable);
 
 struct AdlibRegisterSoundInstrument {
-	uint16 vibrato;
-	uint16 attackDecay;
-	uint16 sustainRelease;
-	uint16 feedbackStrength;
-	uint16 keyScaling;
-	uint16 outputLevel;
-	uint16 freqMod;
+	uint8 vibrato;
+	uint8 attackDecay;
+	uint8 sustainRelease;
+	uint8 feedbackStrength;
+	uint8 keyScaling;
+	uint8 outputLevel;
+	uint8 freqMod;
 };
 
 struct AdlibSoundInstrument {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.