just some cleanup

This commit is contained in:
AJ Kelly
2010-08-04 11:17:46 -05:00
parent 7c52f7b3f2
commit 662e8659fe
3 changed files with 8 additions and 12 deletions
+5 -5
View File
@@ -490,13 +490,13 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
for( unsigned j=0; j<iNumNotesInThisMeasure; j++ )
{
float fPercentThroughMeasure = (float)j/(float)iNumNotesInThisMeasure;
int row = iRowNo + lrintf( fPercentThroughMeasure * fBeatsPerMeasure * ROWS_PER_BEAT );
// some BMS files seem to have funky alignment, causing us to write gigantic cache files.
// Try to correct for this by quantizing.
row = Quantize( row, ROWS_PER_MEASURE/64 );
BmsTrack bmsTrack;
bool bIsHold;
if( ConvertRawTrackToTapNote(iRawTrackNum, bmsTrack, bIsHold) )
@@ -1035,8 +1035,8 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
sTag.MakeLower();
// XXX: We should do this with filenames too, I have plenty of examples.
// however, filenames will be trickier, as stuff at the beginning AND
// end change per-file, so we'll need a fancier FindLargestInitialSubstring()
// however, filenames will be trickier, as stuff at the beginning AND
// end change per-file, so we'll need a fancier FindLargestInitialSubstring()
// XXX: This matches (double), but I haven't seen it used. Again, MORE EXAMPLES NEEDED
if( sTag.find('l') != sTag.npos )
+1 -5
View File
@@ -782,7 +782,7 @@ void ScreenEdit::Init()
m_EditState = EditState_Invalid;
TransitionEditState( STATE_EDITING );
m_bRemoveNoteButtonDown = false;
m_Clipboard.SetNumTracks( m_NoteDataEdit.GetNumTracks() );
@@ -792,7 +792,6 @@ void ScreenEdit::Init()
m_bDirty = false;
m_Player->Init( "Player", GAMESTATE->m_pPlayerState[PLAYER_1], NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL );
m_Player->CacheAllUsedNoteSkins();
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PC_HUMAN;
@@ -829,11 +828,8 @@ void ScreenEdit::Init()
m_soundSave.Load( THEME->GetPathS("ScreenEdit","save") );
m_GameplayAssist.Init();
m_AutoKeysounds.FinishLoading();
m_pSoundMusic = m_AutoKeysounds.GetSound();
this->HandleScreenMessage( SM_UpdateTextInfo );
m_bTextInfoNeedsUpdate = true;
+2 -2
View File
@@ -649,8 +649,8 @@ void ScreenEvaluation::Init()
switch( best_grade )
{
case Grade_Tier01:
case Grade_Tier02:
case Grade_Tier03:
case Grade_Tier02:
case Grade_Tier03:
this->PostScreenMessage( SM_PlayCheer, CHEER_DELAY_SECONDS );
break;
}