[OMPT-svn-commit] SF.net SVN: modplug:[431] trunk/OpenMPT/soundlib/Load_it.cpp

[<sag...@us...>]

Revision: 431
          http://modplug.svn.sourceforge.net/modplug/?rev=431&view=rev
Author:   saga-games
Date:     2009-12-01 18:43:53 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
[Fix] IT/MPTM Loader: I'm stupid. Maybe it will work this time.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2009-11-30 22:11:46 UTC (rev 430)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2009-12-01 18:43:53 UTC (rev 431)
@@ -1209,7 +1209,7 @@
 	// In order to properly compute the position, in file, of eventual extended settings
 	// such as "attack" we need to keep the "real" size of the last sample as those extra
 	// setting will follow this sample in the file
-	UINT lastSampleOffset = 0;
+	UINT lastSampleOffset = smppos[pifh->smpnum - 1] + sizeof(ITSAMPLESTRUCT);
 // -! NEW_FEATURE#0027
 
 	// Reading Samples
@@ -1217,7 +1217,6 @@
 	for (UINT nsmp=0; nsmp<pifh->smpnum; nsmp++) if ((smppos[nsmp]) && (smppos[nsmp] <= dwMemLength - sizeof(ITSAMPLESTRUCT)))
 	{
 		ITSAMPLESTRUCT *pis = (ITSAMPLESTRUCT *)(lpStream+smppos[nsmp]);
-		lastSampleOffset = smppos[nsmp] + sizeof(ITSAMPLESTRUCT);
 		if (pis->id == 0x53504D49)
 		{
 			MODSAMPLE *pSmp = &Samples[nsmp+1];


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