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

Fix Roulette and Random. Both of these were picking a song immediately but making the wheel spinning noises.

Browse Source 
Random looks like it was written with two behaviors in mind. The first is that it acts like Roulette except that where you are in the wheel has no correlation with the song picked and it stops spinning immediately. The second (which seems to have been added later), is to pick a song directly, a la Portal but without giving away any information about it. I went with the former since it was easier (less to clean up).

Roulette feels horribly wrong to me but at least the basic mechanics are there again. I think the Select() logic is wonky.
This commit is contained in:
Steve Checkoway
2007-04-01 09:26:53 +00:00
parent dbff8560a7
commit 47b17ca841
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+12 -9
View File
@@ -803,17 +803,18 @@ void MusicWheel::UpdateSwitch()
}
else
{
m_iSwitchesLeftInSpinDown--;
--m_iSwitchesLeftInSpinDown;
const float SwitchTimes[] = { 0.5f, 1.3f, 0.8f, 0.4f, 0.2f };
ASSERT(m_iSwitchesLeftInSpinDown >= 0 && m_iSwitchesLeftInSpinDown <= 4);
ASSERT( m_iSwitchesLeftInSpinDown >= 0 && m_iSwitchesLeftInSpinDown <= 4 );
m_fTimeLeftInState = SwitchTimes[m_iSwitchesLeftInSpinDown];
m_Moving = 0;
LOG->Trace( "m_iSwitchesLeftInSpinDown id %d, m_fTimeLeftInState is %f", m_iSwitchesLeftInSpinDown, m_fTimeLeftInState );
if( m_iSwitchesLeftInSpinDown < 2 )
ChangeMusic(randomf(0,1) >= 0.5f? 1:-1);
if( m_iSwitchesLeftInSpinDown == 0 )
ChangeMusic( randomf(0,1) >= 0.5f? 1:-1 );
else
ChangeMusic(1);
ChangeMusic( 1 );
}
break;
default:
@@ -918,8 +919,10 @@ bool MusicWheel::Select() // return true if this selection ends the screen
m_WheelState = STATE_LOCKED;
SCREENMAN->PlayStartSound();
m_fLockedWheelVelocity = 0;
// Set m_Moving to zero to stop the sounds from playing.
m_Moving = 0;
SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
return false;
return true;
}
if( !WheelBase::Select() )
@@ -929,10 +932,10 @@ bool MusicWheel::Select() // return true if this selection ends the screen
{
case TYPE_ROULETTE:
StartRoulette();
break;
return false;
case TYPE_RANDOM:
StartRandom();
break;
return false;
case TYPE_SONG:
case TYPE_COURSE:
case TYPE_PORTAL:
@@ -959,6 +962,7 @@ void MusicWheel::StartRoulette()
m_SpinSpeed = 1.0f/ROULETTE_SWITCH_SECONDS;
GAMESTATE->m_SortOrder.Set( SORT_ROULETTE );
SetOpenGroup( "" );
RebuildWheelItems();
}
void MusicWheel::StartRandom()
@@ -987,7 +991,6 @@ void MusicWheel::StartRandom()
SelectSong( GetPreferredSelectionForRandomOrPortal() );
this->Select();
RebuildWheelItems();
}