actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't allow locked songs in edit courses. Allow limiting the number of songs in an edit course to a preference. Nonpositive numbers are infinitely many songs per course (well, up to the hard limit of MAX_ENTRIES_PER_COURSE=50).

Browse Source
This commit is contained in:
Steve Checkoway
2006-06-12 10:49:04 +00:00
parent 930891dec1
commit 2ea4cb1ead
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+19
View File
@@ -24,6 +24,9 @@
#include "LuaFunctions.h" #include "LuaFunctions.h"
#include "LocalizedString.h" #include "LocalizedString.h"
#include "StepsUtil.h" #include "StepsUtil.h"
#include "Preference.h"
static Preference<int> MAX_SONGS_IN_EDIT_COURSE( "MaxSongsInEditCourse", -1 );
static const char *CourseTypeNames[] = { static const char *CourseTypeNames[] = {
"Nonstop", "Nonstop",
@@ -419,6 +422,11 @@ static void GetSongsValidForRandom( vector<Song*> &vpSongsOut )
} }
} }
static bool StepsIsLocked( const Song *pSong, const Steps *pSteps )
{
return UNLOCKMAN->StepsIsLocked( pSong, pSteps );
}
bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) const bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) const
{ {
trail.Init(); trail.Init();
@@ -476,8 +484,13 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
if( e->pSong ) if( e->pSong )
{ {
if( IsAnEdit() && UNLOCKMAN->SongIsLocked(e->pSong) )
continue;
// Choose an exact song, if we have matching steps and all // Choose an exact song, if we have matching steps and all
e->pSong->GetSteps( vpPossibleSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter ); e->pSong->GetSteps( vpPossibleSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter );
// Remove all locked steps.
if( IsAnEdit() )
RemoveIf( vpPossibleSteps, bind1st(ptr_fun(StepsIsLocked), e->pSong) );
if( !vpPossibleSteps.empty() ) if( !vpPossibleSteps.empty() )
pResolvedSong = e->pSong; pResolvedSong = e->pSong;
else else
@@ -608,6 +621,12 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
te.dc = dc; te.dc = dc;
} }
trail.m_vEntries.push_back( te ); trail.m_vEntries.push_back( te );
if( IsAnEdit() && MAX_SONGS_IN_EDIT_COURSE > 0 &&
int(trail.m_vEntries.size()) >= MAX_SONGS_IN_EDIT_COURSE )
{
break;
}
} }
/* Hack: If any entry was non-FIXED, or m_bShuffle is set, then radar values /* Hack: If any entry was non-FIXED, or m_bShuffle is set, then radar values