From 8668075291c8094383bdffb2a1684e627632683f Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 30 Aug 2004 06:41:56 +0000 Subject: [PATCH] fix warnings --- stepmania/src/GameConstantsAndTypes.cpp | 2 +- stepmania/src/GameConstantsAndTypes.h | 2 +- stepmania/src/GameState.cpp | 3 +-- stepmania/src/ScreenEvaluation.cpp | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index 9d9f343049..05e2397073 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -36,7 +36,7 @@ XToThemedString( PlayMode ); StringToX( PlayMode ); -RankingCategory AverageMeterToRankingCategory( float fAverageMeter ) +RankingCategory AverageMeterToRankingCategory( int iAverageMeter ) { if( fAverageMeter <= 3 ) return RANKING_A; else if( fAverageMeter <= 6 ) return RANKING_B; diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 9fcf7f0d40..7088cf5729 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -227,7 +227,7 @@ RankingCategory StringToRankingCategory( const CString& rc ); const CString RANKING_TO_FILL_IN_MARKER[NUM_PLAYERS] = {"#P1#","#P2#"}; inline bool IsRankingToFillIn( const CString& sName ) { return !sName.empty() && sName[0]=='#'; } -RankingCategory AverageMeterToRankingCategory( float fAverageMeter ); +RankingCategory AverageMeterToRankingCategory( int iAverageMeter ); const int NUM_RANKING_LINES = 5; diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 4bd348b4e1..8c008e20e8 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -286,7 +286,6 @@ void AddPlayerStatsToProfile( Profile *pProfile, const StageStats &ss, PlayerNum ASSERT( ss.vpSongs.size() == ss.vpSteps[pn].size() ); for( unsigned i=0; im_iNumSongsPlayedByPlayMode[ss.playMode]++; @@ -637,7 +636,7 @@ void GameState::FinishStage() // Update profile stats Profile* pMachineProfile = PROFILEMAN->GetMachineProfile(); - int iGameplaySeconds = g_CurStageStats.fGameplaySeconds; + int iGameplaySeconds = (int)truncf(g_CurStageStats.fGameplaySeconds); pMachineProfile->m_iTotalGameplaySeconds += iGameplaySeconds; pMachineProfile->m_iCurrentCombo = 0; diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 22a655f035..e673f9b660 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -959,8 +959,8 @@ void ScreenEvaluation::CommitScores( if( stageStats.bFailed[p] ) continue; - float fAverageMeter = stageStats.GetAverageMeter(p); - rcOut[p] = AverageMeterToRankingCategory( fAverageMeter ); + int iAverageMeter = stageStats.GetAverageMeter(p); + rcOut[p] = AverageMeterToRankingCategory( iAverageMeter ); PROFILEMAN->AddCategoryScore( st, rcOut[p], p, hs, iPersonalHighScoreIndexOut[p], iMachineHighScoreIndexOut[p] );