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

Tag team by freem and myself: mmods working 90%.

Browse Source 
The remaining 10%? Dealing with Tsuhsuixamush.
This commit is contained in:
Jason Felds
2011-07-03 13:15:31 -04:00
parent b15322a87a
commit b84fa62579
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+10 -6
View File
@@ -400,8 +400,7 @@ void Player::Init(
m_soundAttackEnding.Load( THEME->GetPathS(sType,"course attack ending"), true, &SoundParams ); m_soundAttackEnding.Load( THEME->GetPathS(sType,"course attack ending"), true, &SoundParams );
break; break;
} }
// XXX: Fix errors for m-mod support!
/*
// calculate M-mod speed here, so we can adjust properly on a per-song basis. // calculate M-mod speed here, so we can adjust properly on a per-song basis.
// XXX: can we find a better location for this? // XXX: can we find a better location for this?
if( m_pPlayerState->m_PlayerOptions.GetCurrent().m_fMaxScrollBPM != 0 ) if( m_pPlayerState->m_PlayerOptions.GetCurrent().m_fMaxScrollBPM != 0 )
@@ -421,6 +420,13 @@ void Player::Init(
float fMaxBPM = 0; float fMaxBPM = 0;
/* TODO: Find a way to not go above a certain BPM range
* for getting the max BPM. Otherwise, you get songs
* like Tsuhsuixamush, M550, 0.18x speed. Even slow
* speed readers would not generally find this fun.
* -Wolfman2000
*/
// all BPMs are listed and available, so try them first. // all BPMs are listed and available, so try them first.
// get the maximum listed value for the song or course. // get the maximum listed value for the song or course.
// if the BPMs are < 0, reset and get the actual values. // if the BPMs are < 0, reset and get the actual values.
@@ -453,11 +459,9 @@ void Player::Init(
ASSERT( fMaxBPM > 0 ); ASSERT( fMaxBPM > 0 );
// set an X-mod equal to Mnum / fMaxBPM (e.g. M600 with 150 becomes 4x) // set an X-mod equal to Mnum / fMaxBPM (e.g. M600 with 150 becomes 4x)
PO_GROUP_ASSIGN(m_pPlayerState->m_PlayerOptions, ModsLevel_Preferred, m_fScrollSpeed,
m_pPlayerState->m_PlayerOptions.GetCurrent().m_fScrollSpeed = m_pPlayerState->m_PlayerOptions.GetPreferred().m_fMaxScrollBPM / fMaxBPM);
( m_pPlayerState->m_PlayerOptions.GetPreferred().m_fMaxScrollBPM / fMaxBPM );
} }
*/
float fBalance = GameSoundManager::GetPlayerBalance( pn ); float fBalance = GameSoundManager::GetPlayerBalance( pn );
m_soundMine.SetProperty( "Pan", fBalance ); m_soundMine.SetProperty( "Pan", fBalance );