From 02d438b33f24a0d29649949339b14f0063ac02f3 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Thu, 11 Mar 2004 10:58:36 +0000 Subject: [PATCH] Fix warnings --- stepmania/src/GameConstantsAndTypes.cpp | 2 +- stepmania/src/PlayerOptions.cpp | 2 +- stepmania/src/ScoreKeeperMAX2.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index f8fa17775f..cd77b66b67 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -230,7 +230,7 @@ CString MemoryCardStateToString( MemoryCardState mcs ) #define XToString(X) \ CString X##ToString( X x ) \ { \ - ASSERT(x < ARRAYSIZE(X##Names)); \ + ASSERT(unsigned(x) < ARRAYSIZE(X##Names)); \ return X##Names[x]; \ } diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp index 22667ba168..384362248d 100644 --- a/stepmania/src/PlayerOptions.cpp +++ b/stepmania/src/PlayerOptions.cpp @@ -558,7 +558,7 @@ bool PlayerOptions::IsHandicapForSong( Song* pSong ) bool PlayerOptions::IsHandicapForCourse( Course* pCourse ) { - for( int i=0; im_entries.size(); i++ ) + for( unsigned i=0; im_entries.size(); i++ ) { const CourseEntry& ce = pCourse->m_entries[i]; if( IsHandicapForSong(ce.pSong) ) diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp index cac1d36faf..4589c838d5 100644 --- a/stepmania/src/ScoreKeeperMAX2.cpp +++ b/stepmania/src/ScoreKeeperMAX2.cpp @@ -423,8 +423,8 @@ int ScoreKeeperMAX2::GetPossibleDancePoints( const float* fRadars ) /* Note that, if Marvelous timing is disabled or not active (not course mode), * PERFECT will be used instead. */ - int NumTaps = fRadars[RADAR_NUM_TAPS_AND_HOLDS]; - int NumHolds = fRadars[RADAR_NUM_HOLDS]; + int NumTaps = int(fRadars[RADAR_NUM_TAPS_AND_HOLDS]); + int NumHolds = int(fRadars[RADAR_NUM_HOLDS]); return NumTaps*TapNoteScoreToDancePoints(TNS_MARVELOUS)+ NumHolds*HoldNoteScoreToDancePoints(HNS_OK); }