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
@@ -979,7 +979,7 @@ void ScreenGameplay::SetupSong( int iSongIndex )
Attack a = pi->m_asModifiersQueue[iSongIndex][i];
if( a.fStartSecond != 0 )
continue;
a.fStartSecond = a.ATTACK_STARTS_NOW; // now
a.fStartSecond = a.ATTACK_STARTS_NOW(); // now
PlayerOptions po;
po.FromString( a.sModifiers );
@@ -1029,7 +1029,7 @@ void ScreenGameplay::SetupSong( int iSongIndex )
{
Attack a = pi->m_asModifiersQueue[iSongIndex][i];
if( a.fStartSecond == 0 )
a.fStartSecond = a.ATTACK_STARTS_NOW; // now
a.fStartSecond = a.ATTACK_STARTS_NOW(); // now
pi->GetPlayerState()->LaunchAttack( a );
GAMESTATE->m_SongOptions.FromString( ModsLevel_Song, a.sModifiers );