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

comment, cleanup

Browse Source 
don't reload sounds unnecessarily
This commit is contained in:
Glenn Maynard
2005-01-15 03:10:08 +00:00
parent 44d55b431a
commit 0409fe9d96
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+31 -26
View File
@@ -185,31 +185,31 @@ void Player::Load( const NoteData& noteData )
switch( GAMESTATE->m_PlayMode ) switch( GAMESTATE->m_PlayMode )
{ {
case PLAY_MODE_RAVE: case PLAY_MODE_RAVE:
case PLAY_MODE_BATTLE: case PLAY_MODE_BATTLE:
{ {
// ugly, ugly, ugly. Works only w/ dance. // ugly, ugly, ugly. Works only w/ dance.
NoteDataUtil::TransformNoteData( m_NoteData, GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions, GAMESTATE->GetCurrentStyle()->m_StepsType ); NoteDataUtil::TransformNoteData( m_NoteData, GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions, GAMESTATE->GetCurrentStyle()->m_StepsType );
// shuffle either p1 or p2 // shuffle either p1 or p2
static int count = 0; static int count = 0;
switch( count ) switch( count )
{ {
case 0: case 0:
case 3: case 3:
NoteDataUtil::Turn( m_NoteData, STEPS_TYPE_DANCE_SINGLE, NoteDataUtil::left); NoteDataUtil::Turn( m_NoteData, STEPS_TYPE_DANCE_SINGLE, NoteDataUtil::left);
break; break;
case 1: case 1:
case 2: case 2:
NoteDataUtil::Turn( m_NoteData, STEPS_TYPE_DANCE_SINGLE, NoteDataUtil::right); NoteDataUtil::Turn( m_NoteData, STEPS_TYPE_DANCE_SINGLE, NoteDataUtil::right);
break; break;
default: default:
ASSERT(0); ASSERT(0);
}
count++;
count %= 4;
} }
break; count++;
count %= 4;
}
break;
} }
int iStartDrawingAtPixels = GAMESTATE->m_bEditing ? -100 : START_DRAWING_AT_PIXELS; int iStartDrawingAtPixels = GAMESTATE->m_bEditing ? -100 : START_DRAWING_AT_PIXELS;
@@ -238,11 +238,15 @@ void Player::Load( const NoteData& noteData )
// they change depending on PlayerOptions. // they change depending on PlayerOptions.
// //
// Load keysounds // Load keysounds. If sounds are already loaded (as in the editor), don't reload them.
// XXX: the editor will load several duplicate copies (in each NoteField), and each
// player will load duplicate sounds. Does this belong somewhere else (perhaps in
// a separate object, used alongside ScreenGameplay::m_pSoundMusic and ScreenEdit::m_pSoundMusic?)
// We don't have to load separate copies to set player fade: always make a copy, and set the
// fade on the copy.
// //
const Song* pSong = GAMESTATE->m_pCurSong; const Song* pSong = GAMESTATE->m_pCurSong;
CString sSongDir = pSong->GetSongDir(); CString sSongDir = pSong->GetSongDir();
m_vKeysounds.clear();
m_vKeysounds.resize( pSong->m_vsKeysoundFile.size() ); m_vKeysounds.resize( pSong->m_vsKeysoundFile.size() );
RageSoundParams p; RageSoundParams p;
@@ -251,7 +255,8 @@ void Player::Load( const NoteData& noteData )
{ {
CString sKeysoundFilePath = sSongDir + pSong->m_vsKeysoundFile[i]; CString sKeysoundFilePath = sSongDir + pSong->m_vsKeysoundFile[i];
RageSound& sound = m_vKeysounds[i]; RageSound& sound = m_vKeysounds[i];
sound.Load( sKeysoundFilePath, true ); if( sound.GetLoadedFilePath() != sKeysoundFilePath )
sound.Load( sKeysoundFilePath, true );
sound.SetParams( p ); sound.SetParams( p );
} }
} }