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

fix warnings

Browse Source
This commit is contained in:
Chris Danford
2004-08-30 06:41:56 +00:00
parent d14a66b8e7
commit 8668075291
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameConstantsAndTypes.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ XToThemedString( PlayMode );
StringToX( PlayMode ); StringToX( PlayMode );
RankingCategory AverageMeterToRankingCategory( float fAverageMeter ) RankingCategory AverageMeterToRankingCategory( int iAverageMeter )
{ {
if( fAverageMeter <= 3 ) return RANKING_A; if( fAverageMeter <= 3 ) return RANKING_A;
else if( fAverageMeter <= 6 ) return RANKING_B; else if( fAverageMeter <= 6 ) return RANKING_B;
stepmania/src/GameConstantsAndTypes.h
+1 -1
View File
@@ -227,7 +227,7 @@ RankingCategory StringToRankingCategory( const CString& rc );
const CString RANKING_TO_FILL_IN_MARKER[NUM_PLAYERS] = {"#P1#","#P2#"}; const CString RANKING_TO_FILL_IN_MARKER[NUM_PLAYERS] = {"#P1#","#P2#"};
inline bool IsRankingToFillIn( const CString& sName ) { return !sName.empty() && sName[0]=='#'; } 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; const int NUM_RANKING_LINES = 5;
stepmania/src/GameState.cpp
+1 -2
View File
@@ -286,7 +286,6 @@ void AddPlayerStatsToProfile( Profile *pProfile, const StageStats &ss, PlayerNum
ASSERT( ss.vpSongs.size() == ss.vpSteps[pn].size() ); ASSERT( ss.vpSongs.size() == ss.vpSteps[pn].size() );
for( unsigned i=0; i<ss.vpSongs.size(); i++ ) for( unsigned i=0; i<ss.vpSongs.size(); i++ )
{ {
Song *pSong = ss.vpSongs[i];
Steps *pSteps = ss.vpSteps[pn][i]; Steps *pSteps = ss.vpSteps[pn][i];
pProfile->m_iNumSongsPlayedByPlayMode[ss.playMode]++; pProfile->m_iNumSongsPlayedByPlayMode[ss.playMode]++;
@@ -637,7 +636,7 @@ void GameState::FinishStage()
// Update profile stats // Update profile stats
Profile* pMachineProfile = PROFILEMAN->GetMachineProfile(); Profile* pMachineProfile = PROFILEMAN->GetMachineProfile();
int iGameplaySeconds = g_CurStageStats.fGameplaySeconds; int iGameplaySeconds = (int)truncf(g_CurStageStats.fGameplaySeconds);
pMachineProfile->m_iTotalGameplaySeconds += iGameplaySeconds; pMachineProfile->m_iTotalGameplaySeconds += iGameplaySeconds;
pMachineProfile->m_iCurrentCombo = 0; pMachineProfile->m_iCurrentCombo = 0;
stepmania/src/ScreenEvaluation.cpp
+2 -2
View File
@@ -959,8 +959,8 @@ void ScreenEvaluation::CommitScores(
if( stageStats.bFailed[p] ) if( stageStats.bFailed[p] )
continue; continue;
float fAverageMeter = stageStats.GetAverageMeter(p); int iAverageMeter = stageStats.GetAverageMeter(p);
rcOut[p] = AverageMeterToRankingCategory( fAverageMeter ); rcOut[p] = AverageMeterToRankingCategory( iAverageMeter );
PROFILEMAN->AddCategoryScore( st, rcOut[p], p, hs, iPersonalHighScoreIndexOut[p], iMachineHighScoreIndexOut[p] ); PROFILEMAN->AddCategoryScore( st, rcOut[p], p, hs, iPersonalHighScoreIndexOut[p], iMachineHighScoreIndexOut[p] );