war on -Werror, part 11: const int -> float loss.

Had to work around the inline static const int rule
to do it, but at least there is no data loss now.
This commit is contained in:
Jason Felds
2012-12-27 11:13:41 -05:00
parent e86aeb66a8
commit bddbed7e7e
4 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -66,7 +66,7 @@ void PlayerState::Update( float fDelta )
// You must add sattack by calling GameState::LaunchAttack,
// or else the sentinel value won't be
// converted into the current music time.
ASSERT( attack.fStartSecond != attack.ATTACK_STARTS_NOW );
ASSERT( attack.fStartSecond != attack.ATTACK_STARTS_NOW() );
bool bCurrentlyEnabled =
attack.bGlobal ||
@@ -116,7 +116,7 @@ void PlayerState::LaunchAttack( const Attack& a )
* started so it can be removed later. For m_ModsToApply, leave the sentinel in,
* so Player::Update knows to apply attack transforms correctly. (yuck) */
m_ModsToApply.push_back( attack );
if( attack.fStartSecond == attack.ATTACK_STARTS_NOW )
if( attack.fStartSecond == attack.ATTACK_STARTS_NOW() )
attack.fStartSecond = m_Position.m_fMusicSeconds;
m_ActiveAttacks.push_back( attack );