From 07cc7b5321d852b3b25c39df6b8e2897d74862fa Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 25 May 2004 20:33:17 +0000
Subject: [PATCH] Fix "4..6" ranges never showing up in CourseContentsList. 
 (That's why iCourseIndex and Course::GetDifficulty existed.)

---
 stepmania/src/Course.cpp             | 1 +
 stepmania/src/CourseEntryDisplay.cpp | 2 +-
 stepmania/src/Trail.h                | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index d89f862b55..01e1975e67 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -775,6 +775,7 @@ void Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
 		te.bMystery = e.mystery;
 		te.iLowMeter = low_meter;
 		te.iHighMeter = high_meter;
+		te.dc = e.difficulty;
 		trail.m_vEntries.push_back( te ); 
 	}
 }
diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp
index 5d9b8b89fd..d447ada929 100644
--- a/stepmania/src/CourseEntryDisplay.cpp
+++ b/stepmania/src/CourseEntryDisplay.cpp
@@ -96,7 +96,7 @@ void CourseEntryDisplay::LoadFromTrailEntry( int iNum, const Course *pCourse, Tr
 		FOREACH_EnabledPlayer(pn)
 		{
 			TrailEntry *te = tes[pn];
-			Difficulty dc = te->pSteps->GetDifficulty();
+			Difficulty dc = te->dc;
 			if( dc == DIFFICULTY_INVALID )
 			{
 				int iLow = te->iLowMeter;
diff --git a/stepmania/src/Trail.h b/stepmania/src/Trail.h
index bfe995d252..dbb2d3e850 100644
--- a/stepmania/src/Trail.h
+++ b/stepmania/src/Trail.h
@@ -23,7 +23,8 @@ struct TrailEntry
 		pSteps(NULL),
 		bMystery(false),
 		iLowMeter(-1),
-		iHighMeter(-1)
+		iHighMeter(-1),
+		dc(DIFFICULTY_INVALID)
 	{
 	}
 	void GetAttackArray( AttackArray &out ) const;
@@ -33,8 +34,12 @@ struct TrailEntry
 	CString		Modifiers;
 	AttackArray Attacks;
 	bool		bMystery;
+
+	/* These represent the meter and difficulty used by the course to pick the
+	 * steps; if you want the real difficulty and meter, look at pSteps. */
 	int			iLowMeter;
 	int			iHighMeter;
+	Difficulty	dc;
 };
 
 class Trail