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:
Glenn Maynard
2003-10-20 06:28:19 +00:00
parent 751f59a72b
commit 53155bb619
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+2 -2
View File
@@ -820,7 +820,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeats> &asFeatsO
feat.Feat = ssprintf("MR #%d in %s %s", j+1, pSong->GetTranslitMainTitle().c_str(), DifficultyToString(pSteps->GetDifficulty()).c_str() ); feat.Feat = ssprintf("MR #%d in %s %s", j+1, pSong->GetTranslitMainTitle().c_str(), DifficultyToString(pSteps->GetDifficulty()).c_str() );
feat.pStringToFill = &vMachineHighScores[j].sName; feat.pStringToFill = &vMachineHighScores[j].sName;
feat.g = vMachineHighScores[j].grade; feat.g = vMachineHighScores[j].grade;
feat.Score = vMachineHighScores[j].iScore; feat.Score = (float) vMachineHighScores[j].iScore;
// XXX: temporary hack // XXX: temporary hack
if( pSong->HasBackground() ) if( pSong->HasBackground() )
@@ -843,7 +843,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeats> &asFeatsO
feat.Feat = ssprintf("PR #%d in %s %s", j+1, pSong->GetTranslitMainTitle().c_str(), DifficultyToString(pSteps->GetDifficulty()).c_str() ); feat.Feat = ssprintf("PR #%d in %s %s", j+1, pSong->GetTranslitMainTitle().c_str(), DifficultyToString(pSteps->GetDifficulty()).c_str() );
feat.pStringToFill = &vPersonalHighScores[j].sName; feat.pStringToFill = &vPersonalHighScores[j].sName;
feat.g = vPersonalHighScores[j].grade; feat.g = vPersonalHighScores[j].grade;
feat.Score = vPersonalHighScores[j].iScore; feat.Score = (float) vPersonalHighScores[j].iScore;
// XXX: temporary hack // XXX: temporary hack
if( pSong->HasBackground() ) if( pSong->HasBackground() )
stepmania/src/SongManager.cpp
+3 -3
View File
@@ -343,7 +343,7 @@ bool FileRead( ifstream& f, float& fOut )
CString s; CString s;
if( !FileRead( f, s ) ) if( !FileRead( f, s ) )
return false; return false;
fOut = atof( s ); fOut = (float) atof( s );
return true; return true;
} }
void FileWrite( ofstream& f, const CString& sWrite ) void FileWrite( ofstream& f, const CString& sWrite )
@@ -393,7 +393,7 @@ void SongManager::ReadStepsMemCardDataFromFile( CString fn, int mc )
if( !FileRead(f, iNumNotes) ) if( !FileRead(f, iNumNotes) )
WARN_AND_RETURN; WARN_AND_RETURN;
for( unsigned n=0; n<iNumNotes; n++ ) for( int n=0; n<iNumNotes; n++ )
{ {
StepsType nt; StepsType nt;
if( !FileRead(f, (int&)nt) ) if( !FileRead(f, (int&)nt) )
@@ -439,7 +439,7 @@ void SongManager::ReadStepsMemCardDataFromFile( CString fn, int mc )
WARN_AND_RETURN; WARN_AND_RETURN;
CLAMP( grade, (Grade)0, (Grade)(NUM_GRADES-1) ); CLAMP( grade, (Grade)0, (Grade)(NUM_GRADES-1) );
float iScore; int iScore;
if( !FileRead(f, iScore) ) if( !FileRead(f, iScore) )
WARN_AND_RETURN; WARN_AND_RETURN;