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

converge keyboard mappings on this screen to one place

Browse Source 
allow changing the global offset while in a course
This commit is contained in:
Glenn Maynard
2006-01-26 06:12:25 +00:00
parent e507e4ab9e
commit 88f525bbca
1 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSyncOverlay.cpp
+42 -32
View File
@@ -164,39 +164,54 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
if( input.DeviceI.device != DEVICE_KEYBOARD ) if( input.DeviceI.device != DEVICE_KEYBOARD )
return false; return false;
enum Action
{
RevertSyncChanges,
ChangeSongBPM,
ChangeGlobalOffset,
ChangeSongOffset,
Action_Invalid
};
Action a = Action_Invalid;
bool bIncrease = true;
switch( input.DeviceI.button ) switch( input.DeviceI.button )
{ {
case KEY_F4: case KEY_F4: a = RevertSyncChanges; break;
case KEY_F9: case KEY_F9: bIncrease = false; /* fall through */
case KEY_F10: case KEY_F10: a = ChangeSongBPM; break;
case KEY_F11: case KEY_F11: bIncrease = false; /* fall through */
case KEY_F12: case KEY_F12:
if( GAMESTATE->IsCourseMode() ) if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT)) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT)) )
{ {
SCREENMAN->SystemMessage( CANT_SYNC_WHILE_PLAYING_A_COURSE ); a = ChangeGlobalOffset;
return true;
} }
else
{
a = ChangeSongOffset;
}
break; break;
default: default:
return false; return false;
} }
switch( input.DeviceI.button ) if( GAMESTATE->IsCourseMode() && a != ChangeGlobalOffset )
{ {
case KEY_F4: SCREENMAN->SystemMessage( CANT_SYNC_WHILE_PLAYING_A_COURSE );
return true;
}
switch( a )
{
case RevertSyncChanges:
SCREENMAN->SystemMessage( SYNC_CHANGES_REVERTED ); SCREENMAN->SystemMessage( SYNC_CHANGES_REVERTED );
GAMESTATE->RevertSyncChanges(); GAMESTATE->RevertSyncChanges();
break; break;
case KEY_F9: case ChangeSongBPM:
case KEY_F10:
{ {
float fDelta; float fDelta = bIncrease? +0.02f:-0.02f;
switch( input.DeviceI.button )
{
case KEY_F9: fDelta = -0.02f; break;
case KEY_F10: fDelta = +0.02f; break;
default: ASSERT(0);
}
if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) || if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) ) INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) )
{ {
@@ -215,16 +230,10 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
} }
} }
break; break;
case KEY_F11: case ChangeGlobalOffset:
case KEY_F12: case ChangeSongOffset:
{ {
float fDelta; float fDelta = bIncrease? +0.02f:-0.02f;
switch( input.DeviceI.button )
{
case KEY_F11: fDelta = +0.02f; break; // notes earlier
case KEY_F12: fDelta = -0.02f; break; // notes earlier
default: ASSERT(0);
}
if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) || if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) ) INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) )
{ {
@@ -237,15 +246,16 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
case IET_FAST_REPEAT: fDelta *= 10; break; case IET_FAST_REPEAT: fDelta *= 10; break;
} }
if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT)) || switch( a )
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT)) )
{ {
case ChangeGlobalOffset:
PREFSMAN->m_fGlobalOffsetSeconds.Set( PREFSMAN->m_fGlobalOffsetSeconds + fDelta ); PREFSMAN->m_fGlobalOffsetSeconds.Set( PREFSMAN->m_fGlobalOffsetSeconds + fDelta );
} break;
else
{ case ChangeSongOffset:
if( GAMESTATE->m_pCurSong != NULL ) if( GAMESTATE->m_pCurSong != NULL )
GAMESTATE->m_pCurSong->m_Timing.m_fBeat0OffsetInSeconds += fDelta; GAMESTATE->m_pCurSong->m_Timing.m_fBeat0OffsetInSeconds += fDelta;
break;
} }
} }
break; break;