[OMPT-svn-commit] SF.net SVN: modplug:[949] trunk/OpenMPT

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

Revision: 949
          http://modplug.svn.sourceforge.net/modplug/?rev=949&view=rev
Author:   saga-games
Date:     2011-07-31 12:02:15 +0000 (Sun, 31 Jul 2011)

Log Message:
-----------
[Fix] Pattern amplify broke in revision 927.
[Mod] 669 Loader: Extended song title.

Revision Links:
--------------
    http://modplug.svn.sourceforge.net/modplug/?rev=927&view=rev

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/View_pat.cpp
    trunk/OpenMPT/soundlib/Load_669.cpp

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2011-07-31 09:45:11 UTC (rev 948)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2011-07-31 12:02:15 UTC (rev 949)
@@ -2890,7 +2890,7 @@
 				}
 				firstChannel++;
 			}
-			if(CreateCursor(0, lastChannel << 3, useVolCol ? VOL_COLUMN : EFFECT_COLUMN) > (m_dwEndSel & 0xFFFF))
+			if(CreateCursor(0, lastChannel, useVolCol ? VOL_COLUMN : EFFECT_COLUMN) > (m_dwEndSel & 0xFFFF))
 			{
 				if(lastChannel == 0)
 				{

Modified: trunk/OpenMPT/soundlib/Load_669.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_669.cpp	2011-07-31 09:45:11 UTC (rev 948)
+++ trunk/OpenMPT/soundlib/Load_669.cpp	2011-07-31 12:02:15 UTC (rev 949)
@@ -69,8 +69,8 @@
 	m_nDefaultSpeed = 6;
 	m_nChannels = 8;
 
-	memcpy(m_szNames[0], pfh->songmessage, 16);
-	SpaceToNullStringFixed<16>(m_szNames[0]);
+	memcpy(m_szNames[0], pfh->songmessage, min(MAX_SAMPLENAME - 1, 36));
+	SpaceToNullStringFixed<min(MAX_SAMPLENAME - 1, 36)>(m_szNames[0]);
 
 	m_nSamples = pfh->samples;
 	for (SAMPLEINDEX nSmp = 1; nSmp <= m_nSamples; nSmp++, psmp++)


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