actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PlayerState::LaunchAttack, RemoveActiveAttacks, missed commit

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-13 05:51:37 +00:00
parent 09c419f482
commit e0c8035435
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+2 -4
View File
@@ -650,7 +650,6 @@ void ScreenEdit::Init()
GAMESTATE->m_fSongBeat = 0; GAMESTATE->m_fSongBeat = 0;
m_fTrailingBeat = GAMESTATE->m_fSongBeat; m_fTrailingBeat = GAMESTATE->m_fSongBeat;
GAMESTATE->ResetNoteSkins();
GAMESTATE->StoreSelectedOptions(); GAMESTATE->StoreSelectedOptions();
m_iShiftAnchor = -1; m_iShiftAnchor = -1;
@@ -671,7 +670,6 @@ void ScreenEdit::Init()
m_PlayerStateEdit.m_PlayerOptions.m_sNoteSkin = "note"; // change noteskin before loading all of the edit Actors m_PlayerStateEdit.m_PlayerOptions.m_sNoteSkin = "note"; // change noteskin before loading all of the edit Actors
m_PlayerStateEdit.m_PlayerNumber = PLAYER_1; m_PlayerStateEdit.m_PlayerNumber = PLAYER_1;
m_PlayerStateEdit.m_PlayerOptions.m_sNoteSkin = GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.m_sNoteSkin; m_PlayerStateEdit.m_PlayerOptions.m_sNoteSkin = GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.m_sNoteSkin;
m_PlayerStateEdit.ResetNoteSkins();
m_pSteps->GetNoteData( m_NoteDataEdit ); m_pSteps->GetNoteData( m_NoteDataEdit );
m_NoteFieldEdit.SetXY( EDIT_X, EDIT_Y ); m_NoteFieldEdit.SetXY( EDIT_X, EDIT_Y );
@@ -3169,7 +3167,7 @@ void ScreenEdit::SetupCourseAttacks()
// Put course options into effect. // Put course options into effect.
GAMESTATE->m_pPlayerState[PLAYER_1]->m_ModsToApply.clear(); GAMESTATE->m_pPlayerState[PLAYER_1]->m_ModsToApply.clear();
GAMESTATE->RemoveActiveAttacksForPlayer( PLAYER_1 ); GAMESTATE->m_pPlayerState[PLAYER_1]->RemoveActiveAttacks();
if( GAMESTATE->m_pCurCourse ) if( GAMESTATE->m_pCurCourse )
@@ -3187,7 +3185,7 @@ void ScreenEdit::SetupCourseAttacks()
} }
for( unsigned i=0; i<Attacks.size(); ++i ) for( unsigned i=0; i<Attacks.size(); ++i )
GAMESTATE->LaunchAttack( (MultiPlayer)PLAYER_1, Attacks[i] ); GAMESTATE->m_pPlayerState[PLAYER_1]->LaunchAttack( Attacks[i] );
} }
GAMESTATE->m_pPlayerState[PLAYER_1]->RebuildPlayerOptionsFromActiveAttacks(); GAMESTATE->m_pPlayerState[PLAYER_1]->RebuildPlayerOptionsFromActiveAttacks();
} }