From 3d7325b457552dddfdc93f298aa6fd39465b99cb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 19 Mar 2005 11:52:14 +0000 Subject: [PATCH] cache all courses --- stepmania/src/Course.cpp | 2 +- stepmania/src/Trail.cpp | 14 -------------- stepmania/src/Trail.h | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index afb3d054da..ac04ee1d0a 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -301,7 +301,7 @@ void Course::LoadFromCRSFile( CString sPath ) FOREACH_CourseDifficulty( cd ) { Trail *pTrail = GetTrail( st, cd ); - if( pTrail == NULL || !pTrail->SlowGetRadarValues() ) + if( pTrail == NULL ) continue; RadarValues rv = pTrail->GetRadarValues(); diff --git a/stepmania/src/Trail.cpp b/stepmania/src/Trail.cpp index 65f78deb45..513f7ecf38 100644 --- a/stepmania/src/Trail.cpp +++ b/stepmania/src/Trail.cpp @@ -40,20 +40,6 @@ bool TrailEntry::ContainsTransformOrTurn() const return false; } -/* Return true if GetRadarValues may be very slow (reads, decodes and - * transforms the Steps), in which case it's worth caching it in Course. */ -bool Trail::SlowGetRadarValues() const -{ - FOREACH_CONST( TrailEntry, m_vEntries, e ) - { - const Steps *pSteps = e->pSteps; - if( !pSteps->IsAutogen() && e->ContainsTransformOrTurn() ) - return true; - } - - return false; -} - void Trail::SetRadarValues( const RadarValues &rv ) { m_CachedRadarValues = rv; diff --git a/stepmania/src/Trail.h b/stepmania/src/Trail.h index 6bc46bf5bc..d1d409c214 100644 --- a/stepmania/src/Trail.h +++ b/stepmania/src/Trail.h @@ -62,7 +62,6 @@ public: m_bRadarValuesCached = false; } - bool SlowGetRadarValues() const; RadarValues GetRadarValues() const; void SetRadarValues( const RadarValues &rv ); // for pre-populating cache int GetMeter() const;