Autogen fixes, stage 1 - tracks are combined semi-correctly (double->single will combine both pads to one)

stepmania/src/NoteData.cpp

@@ -570,3 +570,33 @@ void NoteData::EliminateAllButOneTap(int row)
 	}
 }
 
+// MD 10/29/03 - This is necessary, for whatever reason.
+void NoteData::CombineTracks( int iTrackTo, int iTrackFrom )
+{
+	LOG->Trace("NoteData::CombineTracks( %i , %i )", iTrackTo, iTrackFrom);
+	if(iTrackFrom < 0 || iTrackTo < 0) return;
+	int iLastRow = GetMaxRow();
+	LOG->Trace("NoteData::CombineTracks - %i rows", iLastRow);
+
+	for (int row = 0; row < iLastRow; ++row)
+	{
+		LOG->Trace("NoteData::CombineTracks - row %i", row);
+		int iStepFrom = m_TapNotes[iTrackFrom][row];
+		int iStepTo = m_TapNotes[iTrackTo][row];
+
+		if( iStepFrom == iStepTo )
+		{
+			// no reason to combine same steps
+			continue;
+		}
+		if( iStepTo != TAP_EMPTY ) 
+		{
+			// Mines from "from" track will not knock out any steps in
+			// the "to" track, but this behavior is fine, I think...
+			continue;
+		}
+		m_TapNotes[iTrackTo][row] = iStepFrom;
+	}
+
+	return;
+}