Fix warnings

This commit is contained in:
Steve Checkoway
2004-08-28 11:21:26 +00:00
parent f80433b047
commit cf58bf3ef8
+4 -7
View File
@@ -332,7 +332,7 @@ void ScreenNetSelectMusic::HandleScreenMessage( const ScreenMessage SM )
vector <wstring> wLines; vector <wstring> wLines;
m_textOutHidden.GetLines( wLines ); m_textOutHidden.GetLines( wLines );
CString actualText = ""; CString actualText = "";
for (int i = max( int(wLines.size() - SHOW_CHAT_LINES), 0 ) ; i < wLines.size() ; i++) for (unsigned i = max(wLines.size() - SHOW_CHAT_LINES, unsigned(0) ) ; i < wLines.size() ; ++i)
actualText += WStringToCString(wLines[i])+'\n'; actualText += WStringToCString(wLines[i])+'\n';
m_textChatOutput.SetText( actualText ); m_textChatOutput.SetText( actualText );
break; break;
@@ -345,18 +345,15 @@ void ScreenNetSelectMusic::HandleScreenMessage( const ScreenMessage SM )
UpdateGroupsListPos(); UpdateGroupsListPos();
UpdateSongsList(); UpdateSongsList();
int i; unsigned i;
for ( i = 0; i < m_vSongs.size(); i++) for ( i = 0; i < m_vSongs.size(); ++i)
if ( ( m_vSongs[i]->GetTranslitArtist() == NSMAN->m_sArtist ) && if ( ( m_vSongs[i]->GetTranslitArtist() == NSMAN->m_sArtist ) &&
( m_vSongs[i]->GetTranslitMainTitle() == NSMAN->m_sMainTitle ) && ( m_vSongs[i]->GetTranslitMainTitle() == NSMAN->m_sMainTitle ) &&
( m_vSongs[i]->GetTranslitSubTitle() == NSMAN->m_sSubTitle ) ) ( m_vSongs[i]->GetTranslitSubTitle() == NSMAN->m_sSubTitle ) )
break; break;
bool haveSong = false; bool haveSong = i != m_vSongs.size();
if ( i != m_vSongs.size() )
haveSong = true;
switch (NSMAN->m_iSelectMode) switch (NSMAN->m_iSelectMode)
{ {