From 5a89d4e8f2d6ac3c94067eb85e3d443765291d85 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 1 Nov 2003 19:46:05 +0000
Subject: [PATCH] Fix NoteData::Init not actually clearing data. Improve debug.

---
 stepmania/src/NoteData.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index e0c66d0710..1b474de121 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -17,13 +17,14 @@
 
 NoteData::NoteData()
 {
+	m_iNumTracks = 0;
 	Init();
 }
 
 void NoteData::Init()
 {
-	m_iNumTracks = 0;	// must do this before calling ClearAll()!
 	ClearAll();
+	m_iNumTracks = 0;	// must do this after calling ClearAll()!
 }
 
 NoteData::~NoteData()
@@ -452,7 +453,8 @@ void NoteData::LoadTransformed( const NoteData* pOriginal, int iNewNumTracks, co
 	for( int t=0; t<m_iNumTracks; t++ )
 	{
 		const int iOriginalTrack = iOriginalTrackToTakeFrom[t];
-		ASSERT( iOriginalTrack < Original.m_iNumTracks );
+		RAGE_ASSERT_M( iOriginalTrack < Original.m_iNumTracks, ssprintf("from %i >= %i (to %i)", 
+			iOriginalTrack, Original.m_iNumTracks, iOriginalTrackToTakeFrom[t]));
 
 		if( iOriginalTrack == -1 )
 			continue;