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

fix VC7 warnings

Browse Source
This commit is contained in:
Chris Danford
2004-11-08 06:16:22 +00:00
parent 2fc38be71c
commit ec4090a3eb
7 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataUtil.cpp
-1
View File
@@ -1007,7 +1007,6 @@ void NoteDataUtil::InsertIntelligentTaps(
int iTrackOfNoteEarlier = -1; int iTrackOfNoteEarlier = -1;
bool bEarlierHasNonEmptyTrack = inout.GetTapFirstNonEmptyTrack( iRowEarlier, iTrackOfNoteEarlier ); bool bEarlierHasNonEmptyTrack = inout.GetTapFirstNonEmptyTrack( iRowEarlier, iTrackOfNoteEarlier );
int iTrackOfNoteLater = -1; int iTrackOfNoteLater = -1;
bool bLaterHasNonEmptyTrack = inout.GetTapFirstNonEmptyTrack( iRowLater, iTrackOfNoteLater );
int iTrackOfNoteToAdd = 0; int iTrackOfNoteToAdd = 0;
if( bSkippy && if( bSkippy &&
iTrackOfNoteEarlier != iTrackOfNoteLater ) // Don't make skips on the same note iTrackOfNoteEarlier != iTrackOfNoteLater ) // Don't make skips on the same note
stepmania/src/Player.cpp
+1 -2
View File
@@ -602,7 +602,7 @@ int PlayerMinus::GetClosestNoteDirectional( int col, int iStartRow, int iMaxRows
while( abs(iStartRow-iRow) <= iMaxRowsAhead ) while( abs(iStartRow-iRow) <= iMaxRowsAhead )
{ {
/* Is iRow the row we want? */ /* Is iRow the row we want? */
do for(;;)
{ {
if( m_NoteData.GetTapNote(col, iRow).type == TapNote::empty ) if( m_NoteData.GetTapNote(col, iRow).type == TapNote::empty )
break; break;
@@ -610,7 +610,6 @@ int PlayerMinus::GetClosestNoteDirectional( int col, int iStartRow, int iMaxRows
break; break;
return iRow; return iRow;
} }
while(0);
if( bForward && !m_NoteData.GetNextTapNoteRowForTrack( col, iRow ) ) if( bForward && !m_NoteData.GetNextTapNoteRowForTrack( col, iRow ) )
return -1; return -1;
stepmania/src/RageUtil.cpp
-5
View File
@@ -302,11 +302,6 @@ static int DelimitorLength( const S &Delimitor )
return Delimitor.size(); return Delimitor.size();
} }
static int DelimitorLength( char Delimitor )
{
return 1;
}
template <class S, class C> template <class S, class C>
void do_split( const S &Source, const C Delimitor, vector<S> &AddIt, const bool bIgnoreEmpty ) void do_split( const S &Source, const C Delimitor, vector<S> &AddIt, const bool bIgnoreEmpty )
{ {
stepmania/src/ScreenEndlessBreak.cpp
-2
View File
@@ -12,8 +12,6 @@ ScreenEndlessBreak::ScreenEndlessBreak( CString sName ) : Screen( sName )
ASSERT(GAMESTATE->GetNumPlayersEnabled() > 0); // This should never happen.. but just in case ASSERT(GAMESTATE->GetNumPlayersEnabled() > 0); // This should never happen.. but just in case
PostScreenMessage( SM_BreakInitiated, 0 ); 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( (int)PREFSMAN->m_ShowDancingCharacters != 0 )
{ {
if( GAMESTATE->GetNumPlayersEnabled() == 1 ) if( GAMESTATE->GetNumPlayersEnabled() == 1 )
stepmania/src/ScreenJukebox.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ bool ScreenJukebox::SetSong( bool bDemonstration )
//then we pick a song from this course. //then we pick a song from this course.
Course * tCourse = SONGMAN->GetCourseFromName( THEME->GetCurThemeName() ); Course * tCourse = SONGMAN->GetCourseFromName( THEME->GetCurThemeName() );
if( tCourse != NULL ) 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 ); vSongs.push_back( tCourse->m_entries[i].pSong );
if ( vSongs.size() == 0 ) if ( vSongs.size() == 0 )
stepmania/src/ScreenNetSelectMusic.cpp
+2 -2
View File
@@ -742,7 +742,7 @@ void ScreenNetSelectMusic::UpdateSongsListPos()
else else
{ {
int i; int i;
Difficulty Target; Difficulty Target = DIFFICULTY_EASY;
bool dcs[NUM_DIFFICULTIES]; bool dcs[NUM_DIFFICULTIES];
@@ -823,7 +823,7 @@ void ScreenNetSelectMusic::UpdateUsers()
for( unsigned i=0; i< m_textUsers.size(); i++) for( unsigned i=0; i< m_textUsers.size(); i++)
this->RemoveChild( &m_textUsers[i] ); this->RemoveChild( &m_textUsers[i] );
int oldUsers = m_textUsers.size(); unsigned oldUsers = m_textUsers.size();
m_textUsers.clear(); m_textUsers.clear();
stepmania/src/SongManager.cpp
+17 -17
View File
@@ -41,16 +41,16 @@ SongManager* SONGMAN = NULL; // global and accessable from anywhere in our progr
#define MAX_EDITS_PER_PROFILE 200 #define MAX_EDITS_PER_PROFILE 200
#define MAX_EDIT_SIZE_BYTES 30*1024 // 30KB #define MAX_EDIT_SIZE_BYTES 30*1024 // 30KB
#define NUM_GROUP_COLORS THEME->GetMetricI("SongManager","NumGroupColors") static const ThemeMetric<int> NUM_GROUP_COLORS ("SongManager","NumGroupColors");
#define GROUP_COLOR( i ) THEME->GetMetricC("SongManager",ssprintf("GroupColor%d",i+1)) #define GROUP_COLOR( i ) THEME->GetMetricC("SongManager",ssprintf("GroupColor%d",i+1))
ThemeMetric<RageColor> BEGINNER_COLOR ("SongManager","BeginnerColor"); static const ThemeMetric<RageColor> BEGINNER_COLOR ("SongManager","BeginnerColor");
ThemeMetric<RageColor> EASY_COLOR ("SongManager","EasyColor"); static const ThemeMetric<RageColor> EASY_COLOR ("SongManager","EasyColor");
ThemeMetric<RageColor> MEDIUM_COLOR ("SongManager","MediumColor"); static const ThemeMetric<RageColor> MEDIUM_COLOR ("SongManager","MediumColor");
ThemeMetric<RageColor> HARD_COLOR ("SongManager","HardColor"); static const ThemeMetric<RageColor> HARD_COLOR ("SongManager","HardColor");
ThemeMetric<RageColor> CHALLENGE_COLOR ("SongManager","ChallengeColor"); static const ThemeMetric<RageColor> CHALLENGE_COLOR ("SongManager","ChallengeColor");
ThemeMetric<RageColor> EDIT_COLOR ("SongManager","EditColor"); static const ThemeMetric<RageColor> EDIT_COLOR ("SongManager","EditColor");
ThemeMetric<RageColor> EXTRA_COLOR ("SongManager","ExtraColor"); static const ThemeMetric<RageColor> EXTRA_COLOR ("SongManager","ExtraColor");
ThemeMetric<int> EXTRA_COLOR_METER ("SongManager","ExtraColorMeter"); static const ThemeMetric<int> EXTRA_COLOR_METER ("SongManager","ExtraColorMeter");
vector<RageColor> g_vGroupColors; vector<RageColor> g_vGroupColors;
RageTimer g_LastMetricUpdate; /* can't use RageTimer globally */ RageTimer g_LastMetricUpdate; /* can't use RageTimer globally */
@@ -399,7 +399,7 @@ RageColor SongManager::GetSongColor( const Song* pSong )
// continue; // continue;
if( pSteps->GetMeter() >= EXTRA_COLOR_METER ) if( pSteps->GetMeter() >= EXTRA_COLOR_METER )
return EXTRA_COLOR; return (RageColor)EXTRA_COLOR;
} }
return GetGroupColor( pSong->m_sGroupName ); return GetGroupColor( pSong->m_sGroupName );
@@ -409,13 +409,13 @@ RageColor SongManager::GetDifficultyColor( Difficulty dc ) const
{ {
switch( dc ) switch( dc )
{ {
case DIFFICULTY_BEGINNER: return BEGINNER_COLOR; case DIFFICULTY_BEGINNER: return (RageColor)BEGINNER_COLOR;
case DIFFICULTY_EASY: return EASY_COLOR; case DIFFICULTY_EASY: return (RageColor)EASY_COLOR;
case DIFFICULTY_MEDIUM: return MEDIUM_COLOR; case DIFFICULTY_MEDIUM: return (RageColor)MEDIUM_COLOR;
case DIFFICULTY_HARD: return HARD_COLOR; case DIFFICULTY_HARD: return (RageColor)HARD_COLOR;
case DIFFICULTY_CHALLENGE: return CHALLENGE_COLOR; case DIFFICULTY_CHALLENGE: return (RageColor)CHALLENGE_COLOR;
case DIFFICULTY_EDIT: return EDIT_COLOR; case DIFFICULTY_EDIT: return (RageColor)EDIT_COLOR;
default: ASSERT(0); return EDIT_COLOR; default: ASSERT(0); return (RageColor)EDIT_COLOR;
} }
} }