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

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

Revision: 726
          http://modplug.svn.sourceforge.net/modplug/?rev=726&view=rev
Author:   saga-games
Date:     2010-09-28 20:07:44 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
[Imp] IT Loader: Applying new knowledge about the "special" flags to properly read the row highlight.

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

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2010-09-27 23:41:36 UTC (rev 725)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2010-09-28 20:07:44 UTC (rev 726)
@@ -513,7 +513,9 @@
 			} else if(pifh->cmwt == 0x888 || pifh->cwtv == 0x888)
 			{
 				// OpenMPT 1.17 and 1.18 (raped IT format)
+				// Exact version number will be determined later.
 				interpretModPlugMade = true;
+				m_dwLastSavedWithVersion = MAKE_VERSION_NUMERIC(1, 17, 00, 00);
 			} else if(pifh->cwtv == 0x0217 && pifh->cmwt == 0x0200 && pifh->reserved == 0)
 			{
 				// ModPlug Tracker 1.16 (semi-raped IT format)
@@ -551,14 +553,22 @@
 	if(GetType() == MOD_TYPE_IT) mptStartPos = dwMemLength;
 
 	// Read row highlights
-	if(pifh->cwtv >= 0x0213)
+	if((pifh->special & 0x04))
 	{
-		// MPT 1.09, 1.07 and most likely other old MPT versions as well as some other programs (converters) leave this blank
-		if(pifh->highlight_minor + pifh->highlight_major != 0)
+		// MPT 1.09, 1.07 and most likely other old MPT versions leave this blank (0/0), but have the "special" flag set.
+		// Newer versions of MPT and OpenMPT 1.17 *always* write 4/16 here.
+		// Thus, we will just ignore those old versions.
+		if(m_dwLastSavedWithVersion == 0 || m_dwLastSavedWithVersion >= MAKE_VERSION_NUMERIC(1, 17, 03, 02))
 		{
 			m_nDefaultRowsPerBeat = pifh->highlight_minor;
 			m_nDefaultRowsPerMeasure = pifh->highlight_major;
 		}
+#ifdef DEBUG
+		if((pifh->highlight_minor & pifh->highlight_major) == 0)
+		{
+			Log("IT Header: Row highlight is 0");
+		}
+#endif
 	}
 
 	if (pifh->flags & 0x08) m_dwSongFlags |= SONG_LINEARSLIDES;
@@ -1274,8 +1284,8 @@
 	header.id = LittleEndian(IT_IMPM);
 	lstrcpyn(header.songname, m_szNames[0], 26);
 
-	header.highlight_minor = (BYTE)(m_nDefaultRowsPerBeat & 0xFF);
-	header.highlight_major = (BYTE)(m_nDefaultRowsPerMeasure & 0xFF);
+	header.highlight_minor = (BYTE)min(m_nDefaultRowsPerBeat, 0xFF);
+	header.highlight_major = (BYTE)min(m_nDefaultRowsPerMeasure, 0xFF);
 
 	if(GetType() == MOD_TYPE_MPT)
 	{
@@ -1325,7 +1335,7 @@
 	}
 
 	header.flags = 0x0001;
-	header.special = 0x02 | 0x04;	// 0x02: embed file edit history
+	header.special = 0x02 | 0x04 ;	// 0x02: embed file edit history, 0x04: store row highlight in the header
 	if (m_nInstruments) header.flags |= 0x04;
 	if (m_dwSongFlags & SONG_LINEARSLIDES) header.flags |= 0x08;
 	if (m_dwSongFlags & SONG_ITOLDEFFECTS) header.flags |= 0x10;
@@ -1912,8 +1922,8 @@
 	header.id = LittleEndian(IT_IMPM);
 	lstrcpyn(header.songname, m_szNames[0], 26);
 
-	header.highlight_minor = (BYTE)(m_nDefaultRowsPerBeat & 0xFF);
-	header.highlight_major = (BYTE)(m_nDefaultRowsPerMeasure & 0xFF);
+	header.highlight_minor = (BYTE)min(m_nDefaultRowsPerBeat, 0xFF);
+	header.highlight_major = (BYTE)min(m_nDefaultRowsPerMeasure, 0xFF);
 
 	// An additional "---" pattern is appended so Impulse Tracker won't ignore the last order item.
 	// Interestingly, this can exceed IT's 256 order limit. Also, IT will always save at least two orders.
@@ -1942,7 +1952,7 @@
 	}
 
 	header.flags = 0x0001;
-	header.special = 0x02 | 0x04;	// 0x02: embed file edit history
+	header.special = 0x02 | 0x04 ;	// 0x02: embed file edit history, 0x04: store row highlight in the header
 	if (m_nInstruments) header.flags |= 0x04;
 	if (m_dwSongFlags & SONG_LINEARSLIDES) header.flags |= 0x08;
 	if (m_dwSongFlags & SONG_ITOLDEFFECTS) header.flags |= 0x10;


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