From ec4090a3ebf4d5b19d8e9ffbd6bdb6724245f5f2 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 8 Nov 2004 06:16:22 +0000 Subject: [PATCH] fix VC7 warnings --- stepmania/src/NoteDataUtil.cpp | 1 - stepmania/src/Player.cpp | 3 +-- stepmania/src/RageUtil.cpp | 5 ---- stepmania/src/ScreenEndlessBreak.cpp | 2 -- stepmania/src/ScreenJukebox.cpp | 2 +- stepmania/src/ScreenNetSelectMusic.cpp | 4 +-- stepmania/src/SongManager.cpp | 34 +++++++++++++------------- 7 files changed, 21 insertions(+), 30 deletions(-) diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index 2461b7d096..fa2f60057f 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -1007,7 +1007,6 @@ void NoteDataUtil::InsertIntelligentTaps( int iTrackOfNoteEarlier = -1; bool bEarlierHasNonEmptyTrack = inout.GetTapFirstNonEmptyTrack( iRowEarlier, iTrackOfNoteEarlier ); int iTrackOfNoteLater = -1; - bool bLaterHasNonEmptyTrack = inout.GetTapFirstNonEmptyTrack( iRowLater, iTrackOfNoteLater ); int iTrackOfNoteToAdd = 0; if( bSkippy && iTrackOfNoteEarlier != iTrackOfNoteLater ) // Don't make skips on the same note diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 10912b2354..69b3991d79 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -602,7 +602,7 @@ int PlayerMinus::GetClosestNoteDirectional( int col, int iStartRow, int iMaxRows while( abs(iStartRow-iRow) <= iMaxRowsAhead ) { /* Is iRow the row we want? */ - do + for(;;) { if( m_NoteData.GetTapNote(col, iRow).type == TapNote::empty ) break; @@ -610,7 +610,6 @@ int PlayerMinus::GetClosestNoteDirectional( int col, int iStartRow, int iMaxRows break; return iRow; } - while(0); if( bForward && !m_NoteData.GetNextTapNoteRowForTrack( col, iRow ) ) return -1; diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index e0f2091861..71d760f226 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -302,11 +302,6 @@ static int DelimitorLength( const S &Delimitor ) return Delimitor.size(); } -static int DelimitorLength( char Delimitor ) -{ - return 1; -} - template void do_split( const S &Source, const C Delimitor, vector &AddIt, const bool bIgnoreEmpty ) { diff --git a/stepmania/src/ScreenEndlessBreak.cpp b/stepmania/src/ScreenEndlessBreak.cpp index 0ea273b6fb..68d18ef7d8 100644 --- a/stepmania/src/ScreenEndlessBreak.cpp +++ b/stepmania/src/ScreenEndlessBreak.cpp @@ -12,8 +12,6 @@ ScreenEndlessBreak::ScreenEndlessBreak( CString sName ) : Screen( sName ) ASSERT(GAMESTATE->GetNumPlayersEnabled() > 0); // This should never happen.. but just in case PostScreenMessage( SM_BreakInitiated, 0 ); - bool m_bPicLoaded = false; // I don't know of a better way to see if we failed to load a break picture. If someone does, please do it. - if( (int)PREFSMAN->m_ShowDancingCharacters != 0 ) { if( GAMESTATE->GetNumPlayersEnabled() == 1 ) diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index 3f8b56aafe..8dd6528dc5 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -30,7 +30,7 @@ bool ScreenJukebox::SetSong( bool bDemonstration ) //then we pick a song from this course. Course * tCourse = SONGMAN->GetCourseFromName( THEME->GetCurThemeName() ); if( tCourse != NULL ) - for ( int i = 0; i < tCourse->m_entries.size(); i++ ) + for ( unsigned i = 0; i < tCourse->m_entries.size(); i++ ) vSongs.push_back( tCourse->m_entries[i].pSong ); if ( vSongs.size() == 0 ) diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index 46ceced26f..6a2887c53b 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -742,7 +742,7 @@ void ScreenNetSelectMusic::UpdateSongsListPos() else { int i; - Difficulty Target; + Difficulty Target = DIFFICULTY_EASY; bool dcs[NUM_DIFFICULTIES]; @@ -823,7 +823,7 @@ void ScreenNetSelectMusic::UpdateUsers() for( unsigned i=0; i< m_textUsers.size(); i++) this->RemoveChild( &m_textUsers[i] ); - int oldUsers = m_textUsers.size(); + unsigned oldUsers = m_textUsers.size(); m_textUsers.clear(); diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 20d3e8bbc1..7324f92901 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -41,16 +41,16 @@ SongManager* SONGMAN = NULL; // global and accessable from anywhere in our progr #define MAX_EDITS_PER_PROFILE 200 #define MAX_EDIT_SIZE_BYTES 30*1024 // 30KB -#define NUM_GROUP_COLORS THEME->GetMetricI("SongManager","NumGroupColors") +static const ThemeMetric NUM_GROUP_COLORS ("SongManager","NumGroupColors"); #define GROUP_COLOR( i ) THEME->GetMetricC("SongManager",ssprintf("GroupColor%d",i+1)) -ThemeMetric BEGINNER_COLOR ("SongManager","BeginnerColor"); -ThemeMetric EASY_COLOR ("SongManager","EasyColor"); -ThemeMetric MEDIUM_COLOR ("SongManager","MediumColor"); -ThemeMetric HARD_COLOR ("SongManager","HardColor"); -ThemeMetric CHALLENGE_COLOR ("SongManager","ChallengeColor"); -ThemeMetric EDIT_COLOR ("SongManager","EditColor"); -ThemeMetric EXTRA_COLOR ("SongManager","ExtraColor"); -ThemeMetric EXTRA_COLOR_METER ("SongManager","ExtraColorMeter"); +static const ThemeMetric BEGINNER_COLOR ("SongManager","BeginnerColor"); +static const ThemeMetric EASY_COLOR ("SongManager","EasyColor"); +static const ThemeMetric MEDIUM_COLOR ("SongManager","MediumColor"); +static const ThemeMetric HARD_COLOR ("SongManager","HardColor"); +static const ThemeMetric CHALLENGE_COLOR ("SongManager","ChallengeColor"); +static const ThemeMetric EDIT_COLOR ("SongManager","EditColor"); +static const ThemeMetric EXTRA_COLOR ("SongManager","ExtraColor"); +static const ThemeMetric EXTRA_COLOR_METER ("SongManager","ExtraColorMeter"); vector g_vGroupColors; RageTimer g_LastMetricUpdate; /* can't use RageTimer globally */ @@ -399,7 +399,7 @@ RageColor SongManager::GetSongColor( const Song* pSong ) // continue; if( pSteps->GetMeter() >= EXTRA_COLOR_METER ) - return EXTRA_COLOR; + return (RageColor)EXTRA_COLOR; } return GetGroupColor( pSong->m_sGroupName ); @@ -409,13 +409,13 @@ RageColor SongManager::GetDifficultyColor( Difficulty dc ) const { switch( dc ) { - case DIFFICULTY_BEGINNER: return BEGINNER_COLOR; - case DIFFICULTY_EASY: return EASY_COLOR; - case DIFFICULTY_MEDIUM: return MEDIUM_COLOR; - case DIFFICULTY_HARD: return HARD_COLOR; - case DIFFICULTY_CHALLENGE: return CHALLENGE_COLOR; - case DIFFICULTY_EDIT: return EDIT_COLOR; - default: ASSERT(0); return EDIT_COLOR; + case DIFFICULTY_BEGINNER: return (RageColor)BEGINNER_COLOR; + case DIFFICULTY_EASY: return (RageColor)EASY_COLOR; + case DIFFICULTY_MEDIUM: return (RageColor)MEDIUM_COLOR; + case DIFFICULTY_HARD: return (RageColor)HARD_COLOR; + case DIFFICULTY_CHALLENGE: return (RageColor)CHALLENGE_COLOR; + case DIFFICULTY_EDIT: return (RageColor)EDIT_COLOR; + default: ASSERT(0); return (RageColor)EDIT_COLOR; } }