Fix warnings

This commit is contained in:
Steve Checkoway
2004-03-11 10:58:36 +00:00
parent a5f8f3bc23
commit 02d438b33f
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -230,7 +230,7 @@ CString MemoryCardStateToString( MemoryCardState mcs )
#define XToString(X) \ #define XToString(X) \
CString X##ToString( X x ) \ CString X##ToString( X x ) \
{ \ { \
ASSERT(x < ARRAYSIZE(X##Names)); \ ASSERT(unsigned(x) < ARRAYSIZE(X##Names)); \
return X##Names[x]; \ return X##Names[x]; \
} }
+1 -1
View File
@@ -558,7 +558,7 @@ bool PlayerOptions::IsHandicapForSong( Song* pSong )
bool PlayerOptions::IsHandicapForCourse( Course* pCourse ) bool PlayerOptions::IsHandicapForCourse( Course* pCourse )
{ {
for( int i=0; i<pCourse->m_entries.size(); i++ ) for( unsigned i=0; i<pCourse->m_entries.size(); i++ )
{ {
const CourseEntry& ce = pCourse->m_entries[i]; const CourseEntry& ce = pCourse->m_entries[i];
if( IsHandicapForSong(ce.pSong) ) if( IsHandicapForSong(ce.pSong) )
+2 -2
View File
@@ -423,8 +423,8 @@ int ScoreKeeperMAX2::GetPossibleDancePoints( const float* fRadars )
/* Note that, if Marvelous timing is disabled or not active (not course mode), /* Note that, if Marvelous timing is disabled or not active (not course mode),
* PERFECT will be used instead. */ * PERFECT will be used instead. */
int NumTaps = fRadars[RADAR_NUM_TAPS_AND_HOLDS]; int NumTaps = int(fRadars[RADAR_NUM_TAPS_AND_HOLDS]);
int NumHolds = fRadars[RADAR_NUM_HOLDS]; int NumHolds = int(fRadars[RADAR_NUM_HOLDS]);
return NumTaps*TapNoteScoreToDancePoints(TNS_MARVELOUS)+ return NumTaps*TapNoteScoreToDancePoints(TNS_MARVELOUS)+
NumHolds*HoldNoteScoreToDancePoints(HNS_OK); NumHolds*HoldNoteScoreToDancePoints(HNS_OK);
} }