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

/ to switch players.

Browse Source
This commit is contained in:
Steve Checkoway
2006-08-01 08:28:19 +00:00
parent 77475dd945
commit 0c0e843f3d
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+23 -9
View File
@@ -275,6 +275,9 @@ void ScreenEdit::InitEditMappings()
m_EditMappingsDeviceInput.button[EDIT_BUTTON_UNDO][1] = DeviceInput(DEVICE_KEYBOARD, KEY_Cu); m_EditMappingsDeviceInput.button[EDIT_BUTTON_UNDO][1] = DeviceInput(DEVICE_KEYBOARD, KEY_Cu);
// Switch players, if it makes sense to do so.
m_EditMappingsDeviceInput.button[EDIT_BUTTON_SWITCH_PLAYERS][0] = DeviceInput(DEVICE_KEYBOARD, KEY_SLASH);
m_PlayMappingsDeviceInput.button[EDIT_BUTTON_RETURN_TO_EDIT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_ESC); m_PlayMappingsDeviceInput.button[EDIT_BUTTON_RETURN_TO_EDIT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_ESC);
m_PlayMappingsMenuButton.button[EDIT_BUTTON_RETURN_TO_EDIT][1] = MENU_BUTTON_BACK; m_PlayMappingsMenuButton.button[EDIT_BUTTON_RETURN_TO_EDIT][1] = MENU_BUTTON_BACK;
m_PlayMappingsDeviceInput.button[EDIT_BUTTON_TOGGLE_ASSIST_TICK][0] = DeviceInput(DEVICE_KEYBOARD, KEY_F4); m_PlayMappingsDeviceInput.button[EDIT_BUTTON_TOGGLE_ASSIST_TICK][0] = DeviceInput(DEVICE_KEYBOARD, KEY_F4);
@@ -307,7 +310,7 @@ bool ScreenEdit::DeviceToEdit( const DeviceInput &DeviceI, EditButton &button )
const MapEditToDI *pCurrentMap = GetCurrentDeviceInputMap(); const MapEditToDI *pCurrentMap = GetCurrentDeviceInputMap();
/* First, search to see if a key that requires a modifier is pressed. */ /* First, search to see if a key that requires a modifier is pressed. */
FOREACH_EditButton(e) FOREACH_EditButton( e )
{ {
for( int slot = 0; slot < NUM_EDIT_TO_DEVICE_SLOTS; ++slot ) for( int slot = 0; slot < NUM_EDIT_TO_DEVICE_SLOTS; ++slot )
{ {
@@ -658,7 +661,10 @@ void ScreenEdit::Init()
CopyToLastSave(); CopyToLastSave();
m_CurrentAction = MAIN_MENU_CHOICE_INVALID; m_CurrentAction = MAIN_MENU_CHOICE_INVALID;
m_InputPlayerNumber = PLAYER_INVALID; if( GAMESTATE->m_pCurSteps[0]->m_StepsType == STEPS_TYPE_DANCE_ROUTINE )
m_InputPlayerNumber = PLAYER_1;
else
m_InputPlayerNumber = PLAYER_INVALID;
// set both players to joined so the credit message doesn't show // set both players to joined so the credit message doesn't show
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
GAMESTATE->m_bSideIsJoined[p] = true; GAMESTATE->m_bSideIsJoined[p] = true;
@@ -905,10 +911,9 @@ void ScreenEdit::Update( float fDeltaTime )
else if( fSecsHeld > RECORD_HOLD_SECONDS ) else if( fSecsHeld > RECORD_HOLD_SECONDS )
{ {
// create or extend a hold or roll note // create or extend a hold or roll note
TapNote tn = TAP_ORIGINAL_HOLD_HEAD; TapNote tn = EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) ? TAP_ORIGINAL_ROLL_HEAD: TAP_ORIGINAL_HOLD_HEAD;
tn.pn = m_InputPlayerNumber; tn.pn = m_InputPlayerNumber;
if( EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) )
tn = TAP_ORIGINAL_ROLL_HEAD;
m_NoteDataRecord.AddHoldNote( t, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat), tn ); m_NoteDataRecord.AddHoldNote( t, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat), tn );
} }
} }
@@ -1887,6 +1892,15 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
case EDIT_BUTTON_UNDO: case EDIT_BUTTON_UNDO:
Undo(); Undo();
break; break;
case EDIT_BUTTON_SWITCH_PLAYERS:
if( m_InputPlayerNumber != PLAYER_INVALID )
{
enum_add( m_InputPlayerNumber, 1 );
if( m_InputPlayerNumber == NUM_PLAYERS )
m_InputPlayerNumber = PLAYER_1;
}
break;
} }
} }
@@ -2305,10 +2319,10 @@ void ScreenEdit::ScrollTo( float fDestinationBeat )
// Don't SaveUndo. We want to undo the whole hold, not just the last segment // Don't SaveUndo. We want to undo the whole hold, not just the last segment
// that the user made. Dragging the hold bigger can only absorb and remove // that the user made. Dragging the hold bigger can only absorb and remove
// other taps, so dragging won't cause us to exceed the note limit. // other taps, so dragging won't cause us to exceed the note limit.
if( EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) ) TapNote tn = EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) ? TAP_ORIGINAL_ROLL_HEAD : TAP_ORIGINAL_HOLD_HEAD;
m_NoteDataEdit.AddHoldNote( iCol, iStartRow, iEndRow, TAP_ORIGINAL_ROLL_HEAD );
else tn.pn = m_InputPlayerNumber;
m_NoteDataEdit.AddHoldNote( iCol, iStartRow, iEndRow, TAP_ORIGINAL_HOLD_HEAD ); m_NoteDataEdit.AddHoldNote( iCol, iStartRow, iEndRow, tn );
} }
if( EditIsBeingPressed(EDIT_BUTTON_SCROLL_SELECT) ) if( EditIsBeingPressed(EDIT_BUTTON_SCROLL_SELECT) )
stepmania/src/ScreenEdit.h
+2
View File
@@ -121,6 +121,8 @@ enum EditButton
EDIT_BUTTON_ADD_COURSE_MODS, EDIT_BUTTON_ADD_COURSE_MODS,
EDIT_BUTTON_SWITCH_PLAYERS,
NUM_EDIT_BUTTONS, // leave this at the end NUM_EDIT_BUTTONS, // leave this at the end
EDIT_BUTTON_INVALID EDIT_BUTTON_INVALID
}; };