fix VC7 warnings

This commit is contained in:
Chris Danford
2005-02-15 21:58:35 +00:00
parent d76d94e64e
commit 48911f1572
3 changed files with 11 additions and 9 deletions
+1 -1
View File
@@ -705,7 +705,7 @@ void Player::HandleStep( int col, const RageTimer &tm )
if( iLbs != 0 ) if( iLbs != 0 )
{ {
int iNumTracksHeld = 0; int iNumTracksHeld = 0;
for( unsigned t=0; t<m_NoteData.GetNumTracks(); t++ ) for( int t=0; t<m_NoteData.GetNumTracks(); t++ )
{ {
const StyleInput StyleI( pn, t ); const StyleInput StyleI( pn, t );
const GameInput GameI = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( StyleI ); const GameInput GameI = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( StyleI );
+3 -3
View File
@@ -26,9 +26,9 @@ void RollingNumbers::LoadFromNode( const CString& sDir, const XNode* pNode )
pNode->GetAttrValue( "Format", m_sFormat ); pNode->GetAttrValue( "Format", m_sFormat );
pNode->GetAttrValue( "ApproachSeconds", m_fApproachSeconds ); pNode->GetAttrValue( "ApproachSeconds", m_fApproachSeconds );
int iTargetNumber; float fTargetNumber;
if( pNode->GetAttrValue( "TargetNumber", iTargetNumber ) ) if( pNode->GetAttrValue( "TargetNumber", fTargetNumber ) )
SetTargetNumber( iTargetNumber ); SetTargetNumber( fTargetNumber );
UpdateText(); UpdateText();
} }
+7 -5
View File
@@ -36,6 +36,8 @@ void ScoreDisplayNormal::Init( const PlayerState* pPlayerState )
void ScoreDisplayNormal::SetScore( int iNewScore ) void ScoreDisplayNormal::SetScore( int iNewScore )
{ {
float fScore = (float)iNewScore;
// TODO: Remove use of PlayerNumber. // TODO: Remove use of PlayerNumber.
PlayerNumber pn = m_pPlayerState->m_PlayerNumber; PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
@@ -53,21 +55,21 @@ void ScoreDisplayNormal::SetScore( int iNewScore )
// nothing to do // nothing to do
break; break;
case PlayerOptions::SCORING_SUBTRACT: case PlayerOptions::SCORING_SUBTRACT:
iNewScore = iMaxScore - ( iCurMaxScore - iNewScore ); fScore = iMaxScore - ( iCurMaxScore - fScore );
break; break;
case PlayerOptions::SCORING_AVERAGE: case PlayerOptions::SCORING_AVERAGE:
if( iCurMaxScore == 0 ) // don't divide by zero fats if( iCurMaxScore == 0 ) // don't divide by zero fats
{ {
iNewScore = 0; fScore = 0;
} }
else else
{ {
float fScoreRatio = iNewScore / (float)iCurMaxScore; float fScoreRatio = fScore / (float)iCurMaxScore;
iNewScore = fScoreRatio * iMaxScore; fScore = fScoreRatio * iMaxScore;
} }
} }
m_text.SetTargetNumber( iNewScore ); m_text.SetTargetNumber( fScore );
} }
/* /*