[Scummvm-cvs-logs] SF.net SVN: scummvm:[49210] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 49210
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49210&view=rev
Author:   fingolfin
Date:     2010-05-25 11:35:16 +0000 (Tue, 25 May 2010)

Log Message:
-----------
Patch #3006178: "rjp1: calculate sample length correctly"

Fixes bug #3001110: "FOTAQ Amiga: crashes reporting assertion failure"
Added a NEWS entry to the patch.

Modified Paths:
--------------
    scummvm/trunk/NEWS
    scummvm/trunk/sound/mods/rjp1.cpp

Modified: scummvm/trunk/NEWS
===================================================================
--- scummvm/trunk/NEWS	2010-05-25 10:46:56 UTC (rev 49209)
+++ scummvm/trunk/NEWS	2010-05-25 11:35:16 UTC (rev 49210)
@@ -8,6 +8,7 @@
 
  General:
    - Switched to the "fast" DOSBox OPL emulator.
+   - Fixed a crash in the rjp1 player code affecting the FOTAQ Amiga version.
 
 1.1.2 (????-??-??)
   Broken Sword 2

Modified: scummvm/trunk/sound/mods/rjp1.cpp
===================================================================
--- scummvm/trunk/sound/mods/rjp1.cpp	2010-05-25 10:46:56 UTC (rev 49209)
+++ scummvm/trunk/sound/mods/rjp1.cpp	2010-05-25 11:35:16 UTC (rev 49210)
@@ -422,7 +422,7 @@
 		channel->envelopeMode = 4;
 		channel->data = channel->waveData;
 		channel->pos = READ_BE_UINT16(note + 16);
-		channel->len = READ_BE_UINT16(note + 18);
+		channel->len = channel->pos + READ_BE_UINT16(note + 18);
 		channel->setupNewNote = true;
 	}
 }


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