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

[splittiming] Fix editor bug on create & no save.

Browse Source 
Hmm...is this bug also in default?
This commit is contained in:
Jason Felds
2011-05-12 20:50:38 -04:00
parent de66de1e74
commit f9da743e59
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteField.cpp
+6 -4
View File
@@ -739,10 +739,12 @@ void NoteField::DrawPrimitives()
cur->m_ReceptorArrowRow.Draw(); cur->m_ReceptorArrowRow.Draw();
} }
Steps *stepChecking = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber];
// Draw beat bars // Draw beat bars
if( GAMESTATE->IsEditing() || SHOW_BEAT_BARS ) if( ( GAMESTATE->IsEditing() || SHOW_BEAT_BARS ) && stepChecking != NULL )
{ {
const vector<TimeSignatureSegment> &vTimeSignatureSegments = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]->m_Timing.m_vTimeSignatureSegments; const vector<TimeSignatureSegment> &vTimeSignatureSegments = stepChecking->m_Timing.m_vTimeSignatureSegments;
int iMeasureIndex = 0; int iMeasureIndex = 0;
FOREACH_CONST( TimeSignatureSegment, vTimeSignatureSegments, iter ) FOREACH_CONST( TimeSignatureSegment, vTimeSignatureSegments, iter )
{ {
@@ -781,11 +783,11 @@ void NoteField::DrawPrimitives()
} }
} }
if( GAMESTATE->IsEditing() ) if( GAMESTATE->IsEditing() && stepChecking != NULL )
{ {
ASSERT(GAMESTATE->m_pCurSong); ASSERT(GAMESTATE->m_pCurSong);
const TimingData &timing = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]->m_Timing; const TimingData &timing = stepChecking->m_Timing;
// BPM text // BPM text
FOREACH_CONST( BPMSegment, timing.m_BPMSegments, seg ) FOREACH_CONST( BPMSegment, timing.m_BPMSegments, seg )