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

[WindowsResources.rc] afxres -> winres [Midiman]

Browse Source 
[StepMania.cpp] Allow holding RShift for uncompressed screenshots. Attempt to fix screenshot numbering problem. [AJ]
[also StepMania.cpp] console display message on pause/break [Midiman]
This commit is contained in:
AJ Kelly
2010-06-14 23:01:28 -05:00
parent 64c3f94888
commit c151ba0151
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/StepMania.cpp
+13 -5
View File
@@ -1399,6 +1399,13 @@ bool HandleGlobalInputs( const InputEventPlus &input )
return true;
}
if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_PAUSE) )
{
Message msg("ToggleConsoleDisplay");
MESSAGEMAN->Broadcast( msg );
return true;
}
#if !defined(MACOSX)
if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F4) )
{
@@ -1443,15 +1450,16 @@ bool HandleGlobalInputs( const InputEventPlus &input )
#endif
if( bDoScreenshot )
{
// If holding LShift save uncompressed, else save compressed
// todo: allow for RShift -aj
bool bSaveCompressed = !INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) );
// If holding Shift save uncompressed, else save compressed
bool bHoldingShift = ( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) )
|| INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) ) );
bool bSaveCompressed = !bHoldingShift;
RageTimer timer;
StepMania::SaveScreenshot( "Screenshots/", bSaveCompressed, false );
StepMania::SaveScreenshot( "Screenshots/", bSaveCompressed, false, -1 );
LOG->Trace( "Screenshot took %f seconds.", timer.GetDeltaTime() );
return true; // handled
}
if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_ENTER) &&
(INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RALT), &input.InputList) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LALT), &input.InputList)) )