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

StartRandom() Now uses a linear shuffle instead of an exchange shuffle, so the distribution of songs should be as good as rand().

Browse Source
This commit is contained in:
Christopher Pitman
2003-09-28 19:14:00 +00:00
parent 3112a765ae
commit 9982447fb8
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+11 -13
View File
@@ -1230,23 +1230,21 @@ void MusicWheel::StartRoulette()
void MusicWheel::StartRandom() void MusicWheel::StartRandom()
{ {
/* Shuffle the roulette wheel. */ /* Shuffle the roulette wheel. */
//unsigned total = m_WheelItemDatas[SORT_ROULETTE].size(); /*Linear shuffle means that we shuffle the deck from the beginning to end,
//for(unsigned i = 0; i < total; ++i) but never switch a song from the end with one < i. This method gives an
// swap(m_WheelItemDatas[SORT_ROULETTE][i], m_WheelItemDatas[SORT_ROULETTE][rand() % total]); even distribution for any number of songs less than RAND_MAX.*/
unsigned total = m_WheelItemDatas[SORT_ROULETTE].size();
for(unsigned i = 0; i < total; ++i)
swap(m_WheelItemDatas[SORT_ROULETTE][i], m_WheelItemDatas[SORT_ROULETTE][(rand() % (total-i))+i]);
//SetOpenGroup("", SongSortOrder(SORT_ROULETTE)); SetOpenGroup("", SongSortOrder(SORT_ROULETTE));
//m_Moving = -1; m_Moving = -1;
//m_TimeBeforeMovingBegins = 0; m_TimeBeforeMovingBegins = 0;
//m_SpinSpeed = 1.0f/ROULETTE_SWITCH_SECONDS; m_SpinSpeed = 1.0f/ROULETTE_SWITCH_SECONDS;
//m_SpinSpeed *= 20.0f; /* faster! */ m_SpinSpeed *= 20.0f; /* faster! */
//Simplify Random to make it more random than previously
m_WheelState = STATE_RANDOM_SPINNING; m_WheelState = STATE_RANDOM_SPINNING;
SelectSong(SONGMAN->GetRandomSong());
this->Select(); this->Select();
RebuildMusicWheelItems(); RebuildMusicWheelItems();
} }