New branch: [sm5a2futures]
Want to make sure we don't cause conflicts for future 1a builds. This commit: change the sentinel for launching attacks immediately. This way, songs with negative gaps can have attacks work here. Thanks to Saturn for the assist.
This commit is contained in:
@@ -968,7 +968,7 @@ void ScreenGameplay::SetupSong( int iSongIndex )
|
||||
Attack a = pi->m_asModifiersQueue[iSongIndex][i];
|
||||
if( a.fStartSecond != 0 )
|
||||
continue;
|
||||
a.fStartSecond = -1; // now
|
||||
a.fStartSecond = a.ATTACK_STARTS_NOW; // now
|
||||
|
||||
PlayerOptions po;
|
||||
po.FromString( a.sModifiers );
|
||||
@@ -1018,7 +1018,7 @@ void ScreenGameplay::SetupSong( int iSongIndex )
|
||||
{
|
||||
Attack a = pi->m_asModifiersQueue[iSongIndex][i];
|
||||
if( a.fStartSecond == 0 )
|
||||
a.fStartSecond = -1; // now
|
||||
a.fStartSecond = a.ATTACK_STARTS_NOW; // now
|
||||
|
||||
pi->GetPlayerState()->LaunchAttack( a );
|
||||
GAMESTATE->m_SongOptions.FromString( ModsLevel_Song, a.sModifiers );
|
||||
|
||||
Reference in New Issue
Block a user