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

Fix g++ warnings.

Browse Source
This commit is contained in:
Jason Felds
2011-03-14 01:21:30 -04:00
parent 8055d162fd
commit 4d074f3b81
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+2 -2
View File
@@ -572,8 +572,8 @@ float TimingData::GetElapsedTimeFromBeatNoOffset( float fBeat ) const
/* A traditional stop has the beat happening before the stop (>=) /* A traditional stop has the beat happening before the stop (>=)
* A Pump delay acts differently. [aj: how?] (>) * A Pump delay acts differently. [aj: how?] (>)
*/ */
if( m_StopSegments[j].m_iStartRow >= iRow && !m_StopSegments[j].m_bDelay || if( ( m_StopSegments[j].m_iStartRow >= iRow && !m_StopSegments[j].m_bDelay ) ||
m_StopSegments[j].m_iStartRow > iRow && m_StopSegments[j].m_bDelay ) ( m_StopSegments[j].m_iStartRow > iRow && m_StopSegments[j].m_bDelay ) )
break; break;
fElapsedTime += m_StopSegments[j].m_fStopSeconds; fElapsedTime += m_StopSegments[j].m_fStopSeconds;
} }
src/TimingData.h
+1 -1
View File
@@ -174,7 +174,7 @@ struct StopSegment
{ {
return ( m_iStartRow < other.m_iStartRow ) || return ( m_iStartRow < other.m_iStartRow ) ||
( m_iStartRow == other.m_iStartRow && ( m_iStartRow == other.m_iStartRow &&
( m_bDelay && !other.m_bDelay || m_fStopSeconds < other.m_fStopSeconds )); ( ( m_bDelay && !other.m_bDelay ) || m_fStopSeconds < other.m_fStopSeconds ));
} }
/** /**
* @brief Compares two StopSegments to see if one is less than or equal to the other. * @brief Compares two StopSegments to see if one is less than or equal to the other.