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

Reference not pointer.

Browse Source
This commit is contained in:
Steve Checkoway
2007-02-14 11:16:11 +00:00
parent 45038b7216
commit 649d24f780
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderBMS.cpp
+3 -3
View File
@@ -829,7 +829,7 @@ void BMSLoader::ReadGlobalTags( const NameToData_t &mapNameToData, Song &out )
} }
/* Now that we're done reading BPMs, factor out weird time signatures. */ /* Now that we're done reading BPMs, factor out weird time signatures. */
SetTimeSigAdjustments( mapMeasureToTimeSig, &out ); SetTimeSigAdjustments( mapMeasureToTimeSig, out );
} }
void BMSLoader::ReadTimeSigs( const NameToData_t &mapNameToData, MeasureToTimeSig_t &out ) void BMSLoader::ReadTimeSigs( const NameToData_t &mapNameToData, MeasureToTimeSig_t &out )
@@ -860,7 +860,7 @@ void BMSLoader::ReadTimeSigs( const NameToData_t &mapNameToData, MeasureToTimeSi
* Evaluate each time signature, and guess which time signatures should be converted * Evaluate each time signature, and guess which time signatures should be converted
* to BPM changes. This isn't perfect, but errors aren't fatal. * to BPM changes. This isn't perfect, but errors aren't fatal.
*/ */
void BMSLoader::SetTimeSigAdjustments( const MeasureToTimeSig_t &sigs, Song *pOut ) void BMSLoader::SetTimeSigAdjustments( const MeasureToTimeSig_t &sigs, Song &pOut )
{ {
return; return;
m_TimeSigAdjustments.clear(); m_TimeSigAdjustments.clear();
@@ -917,7 +917,7 @@ void BMSLoader::SetTimeSigAdjustments( const MeasureToTimeSig_t &sigs, Song *pOu
m_TimeSigAdjustments[iMeasure] = 1.0f / fFactor; m_TimeSigAdjustments[iMeasure] = 1.0f / fFactor;
int iAdjustmentStartRow = GetMeasureStartRow( sigs, iMeasure ); int iAdjustmentStartRow = GetMeasureStartRow( sigs, iMeasure );
int iAdjustmentEndRow = GetMeasureStartRow( sigs, iMeasure+1 ); int iAdjustmentEndRow = GetMeasureStartRow( sigs, iMeasure+1 );
pOut->m_Timing.MultiplyBPMInBeatRange( iAdjustmentStartRow, iAdjustmentEndRow, 1.0f / fFactor ); pOut.m_Timing.MultiplyBPMInBeatRange( iAdjustmentStartRow, iAdjustmentEndRow, 1.0f / fFactor );
} }
} }
stepmania/src/NotesLoaderBMS.h
+1 -1
View File
@@ -20,7 +20,7 @@ class BMSLoader: public NotesLoader
void ReadTimeSigs( const NameToData_t &mapNameToData, MeasureToTimeSig_t &out ); void ReadTimeSigs( const NameToData_t &mapNameToData, MeasureToTimeSig_t &out );
float GetBeatsPerMeasure( const MeasureToTimeSig_t &sigs, int iMeasure ); float GetBeatsPerMeasure( const MeasureToTimeSig_t &sigs, int iMeasure );
int GetMeasureStartRow( const MeasureToTimeSig_t &sigs, int iMeasureNo ); int GetMeasureStartRow( const MeasureToTimeSig_t &sigs, int iMeasureNo );
void SetTimeSigAdjustments( const MeasureToTimeSig_t &sigs, Song *pOut ); void SetTimeSigAdjustments( const MeasureToTimeSig_t &sigs, Song &pOut );
MeasureToTimeSig_t m_TimeSigAdjustments; MeasureToTimeSig_t m_TimeSigAdjustments;
RString m_sDir; RString m_sDir;