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

fix warnings

Browse Source
This commit is contained in:
Chris Danford
2005-05-04 04:00:00 +00:00
parent 9eb8396521
commit 8e987d18b6
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BitmapText.cpp
+3 -3
View File
@@ -380,13 +380,13 @@ void BitmapText::SetText( const CString& _sText, const CString& _sAlternateText,
change.l = sEndText.length(); change.l = sEndText.length();
m_vColors.push_back( change ); m_vColors.push_back( change );
last = i+9; last = i+9;
if ( last < m_sText.length() ) if ( last < (int)m_sText.length() )
i = m_sText.Find( CString("|c0"), last ); i = m_sText.Find( CString("|c0"), last );
else else
i = -1; i = -1;
} }
if ( last < m_sText.length() ) if ( last < (int)m_sText.length() )
sEndText += m_sText.substr( last, m_sText.length()-last ); sEndText += m_sText.substr( last, m_sText.length()-last );
m_sText = sEndText; m_sText = sEndText;
@@ -653,7 +653,7 @@ void BitmapText::DrawPrimitives()
for( unsigned i=0; i<verts.size(); i+=4 ) for( unsigned i=0; i<verts.size(); i+=4 )
{ {
loc++; loc++;
if ( cur < m_vColors.size() ) if ( cur < (int)m_vColors.size() )
if ( loc > m_vColors[cur].l ) if ( loc > m_vColors[cur].l )
{ {
c = m_vColors[cur].c; c = m_vColors[cur].c;
stepmania/src/MenuTimer.cpp
+15 -18
View File
@@ -71,39 +71,36 @@ void MenuTimer::Update( float fDeltaTime )
const float fOldSecondsLeft = m_fSecondsLeft; const float fOldSecondsLeft = m_fSecondsLeft;
m_fSecondsLeft -= fDeltaTime; m_fSecondsLeft -= fDeltaTime;
m_fSecondsLeft = max( 0, m_fSecondsLeft );
const float fNewSecondsLeft = m_fSecondsLeft; const float fNewSecondsLeft = m_fSecondsLeft;
const int iOldDisplay = (int)(fOldSecondsLeft + 0.99f); if( fOldSecondsLeft == fNewSecondsLeft )
int iNewDisplay = (int)(fNewSecondsLeft + 0.99f); return;
iNewDisplay = max( iNewDisplay, 0 );
if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5 if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") );
if( iOldDisplay == iNewDisplay ) SetText( fNewSecondsLeft );
return;
SetText( iNewDisplay ); for( int s=0; s<WARNING_START; s++ )
if( iNewDisplay <= WARNING_START )
{ {
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ ) if( fOldSecondsLeft > s && fNewSecondsLeft < s ) // crossed
m_text[i].RunCommands( WARNING_COMMAND.GetValue(iNewDisplay) ); {
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
m_text[i].RunCommands( WARNING_COMMAND.GetValue(s) );
if( i <= WARNING_BEEP_START && m_soundBeep.IsLoaded() )
m_soundBeep.Play();
}
} }
if( iNewDisplay == 0 ) if( fNewSecondsLeft == 0 )
{ {
Stop(); Stop();
SCREENMAN->PostMessageToTopScreen( SM_MenuTimer, 0 ); SCREENMAN->PostMessageToTopScreen( SM_MenuTimer, 0 );
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ ) for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
m_text[i].SetEffectNone(); m_text[i].SetEffectNone();
} }
if( iNewDisplay <= WARNING_BEEP_START )
{
if( m_soundBeep.IsLoaded() )
m_soundBeep.Play();
}
} }
@@ -145,7 +142,7 @@ void MenuTimer::SetSeconds( float fSeconds )
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ ) for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
m_text[i].PlayCommand( "On" ); m_text[i].PlayCommand( "On" );
SetText( (int)fSeconds ); SetText( fSeconds );
} }
void MenuTimer::Start() void MenuTimer::Start()