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

working on "attack notes"

Browse Source
This commit is contained in:
Chris Danford
2003-11-12 08:32:32 +00:00
parent d5e94b0a70
commit f9cdbab937
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteData.cpp
+1
View File
@@ -596,6 +596,7 @@ void NoteData::SetTapNoteAttack( int track, int row, CString sMods, float fDurat
if(row < 0) return; if(row < 0) return;
PadTapNotes(row); PadTapNotes(row);
// TODO: mark as TAP_ATTACK and save attack params to array
m_TapNotes[track][row]=TAP_TAP; m_TapNotes[track][row]=TAP_TAP;
} }
stepmania/src/NoteData.h
+1
View File
@@ -51,6 +51,7 @@ public:
} }
void MoveTapNoteTrack(int dest, int src); void MoveTapNoteTrack(int dest, int src);
void SetTapNote(int track, int row, TapNote t); void SetTapNote(int track, int row, TapNote t);
void SetTapNoteAttack( int track, int row, CString sMods, float fDurationSeconds );
void ClearRange( int iNoteIndexBegin, int iNoteIndexEnd ); void ClearRange( int iNoteIndexBegin, int iNoteIndexEnd );
void ClearAll(); void ClearAll();
stepmania/src/ScreenEdit.cpp
+7 -1
View File
@@ -223,7 +223,7 @@ static Menu g_BGChange( "Background Change", g_BGChangeItems );
static const MenuRow g_InsertAttackItems[] = static const MenuRow g_InsertAttackItems[] =
{ {
{ "Duration", true, 2, { "0:10","0:20","0:30","0:40","0:50","1:00","1:10","1:20","1:30","1:40","1:50","2:00" } }, { "Duration seconds", true, 2, { "10","20","30","40","50","60","70","80","90" } },
{ "Set modifiers", true, 0, { "PRESS START" } }, { "Set modifiers", true, 0, { "PRESS START" } },
{ NULL, true, 0, { NULL } } { NULL, true, 0, { NULL } }
}; };
@@ -233,6 +233,7 @@ static Menu g_InsertAttack( "Insert Attack", g_InsertAttackItems );
// that we can lay the attack note after coming back from // that we can lay the attack note after coming back from
// menus. // menus.
int g_iLastInsertAttackTrack = -1; int g_iLastInsertAttackTrack = -1;
float g_fLastInsertAttackDurationSeconds = -1;
ScreenEdit::ScreenEdit( CString sName ) : Screen( sName ) ScreenEdit::ScreenEdit( CString sName ) : Screen( sName )
{ {
@@ -1264,8 +1265,12 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
m_soundMusic.SetPlaybackRate( GAMESTATE->m_SongOptions.m_fMusicRate ); m_soundMusic.SetPlaybackRate( GAMESTATE->m_SongOptions.m_fMusicRate );
break; break;
case SM_BackFromInsertAttack: case SM_BackFromInsertAttack:
{
int iDurationChoice = ScreenMiniMenu::s_iLastAnswers[0];
g_fLastInsertAttackDurationSeconds = atof( g_InsertAttackItems[0].choices[iDurationChoice] );
GAMESTATE->StoreSelectedOptions(); // save so that we don't lose the options chosen for edit and playback GAMESTATE->StoreSelectedOptions(); // save so that we don't lose the options chosen for edit and playback
SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions", SM_BackFromInsertAttackModifiers ); SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions", SM_BackFromInsertAttackModifiers );
}
break; break;
case SM_BackFromInsertAttackModifiers: case SM_BackFromInsertAttackModifiers:
{ {
@@ -1273,6 +1278,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
CString sMods = poChosen.GetString(); CString sMods = poChosen.GetString();
int row = BeatToNoteRow( GAMESTATE->m_fSongBeat ); int row = BeatToNoteRow( GAMESTATE->m_fSongBeat );
m_NoteFieldEdit.SetTapNote( g_iLastInsertAttackTrack, row, TAP_TAP ); m_NoteFieldEdit.SetTapNote( g_iLastInsertAttackTrack, row, TAP_TAP );
m_NoteFieldEdit.SetTapNoteAttack( g_iLastInsertAttackTrack, row, sMods, g_fLastInsertAttackDurationSeconds );
GAMESTATE->RestoreSelectedOptions(); // restore the edit and playback options GAMESTATE->RestoreSelectedOptions(); // restore the edit and playback options
} }
break; break;