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

some commenting and cleanup

Browse Source
This commit is contained in:
AJ Kelly
2010-05-30 22:49:44 -05:00
parent 9a29217752
commit 59b481eaba
4 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BPMDisplay.cpp
+2 -1
View File
@@ -74,6 +74,7 @@ void BPMDisplay::Update( float fDeltaTime )
{ {
m_fBPMFrom = -1; m_fBPMFrom = -1;
// todo: allow themer to customize "xxx" string -aj
if( (bool)SHOW_QMARKS ) if( (bool)SHOW_QMARKS )
SetText( (RandomFloat(0,1)>0.90f) ? RString("xxx") : ssprintf("%03.0f",RandomFloat(0,999)) ); SetText( (RandomFloat(0,1)>0.90f) ? RString("xxx") : ssprintf("%03.0f",RandomFloat(0,999)) );
else else
@@ -120,7 +121,7 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
if( MinBPM == MaxBPM ) if( MinBPM == MaxBPM )
{ {
if( MinBPM == -1 ) if( MinBPM == -1 )
SetText( "..." ); // random SetText( "..." ); // random (todo: let themer customize string -aj)
else else
SetText( ssprintf("%i", MinBPM) ); SetText( ssprintf("%i", MinBPM) );
} }
src/StepMania.cpp
+2 -18
View File
@@ -827,16 +827,6 @@ void StepMania::ChangeCurrentGame( const Game* g )
ASSERT( ANNOUNCER ); ASSERT( ANNOUNCER );
ASSERT( THEME ); ASSERT( THEME );
// process game command line argument. oh dear. -aj
RString argGame;
if( GetCommandlineArgument( "game",&argGame) )
{
// we need to perform some conversion surgery
const Game* newG = GAMEMAN->StringToGame(argGame);
if(newG && newG != g)
g = newG;
}
GAMESTATE->SetCurGame( g ); GAMESTATE->SetCurGame( g );
RString sAnnouncer = PREFSMAN->m_sAnnouncer; RString sAnnouncer = PREFSMAN->m_sAnnouncer;
@@ -1353,7 +1343,6 @@ bool HandleGlobalInputs( const InputEventPlus &input )
switch( input.MenuI ) switch( input.MenuI )
{ {
case GAME_BUTTON_OPERATOR: case GAME_BUTTON_OPERATOR:
/* Global operator key, to get quick access to the options menu. Don't /* Global operator key, to get quick access to the options menu. Don't
* do this if we're on a "system menu", which includes the editor * do this if we're on a "system menu", which includes the editor
* (to prevent quitting without storing changes). */ * (to prevent quitting without storing changes). */
@@ -1407,12 +1396,6 @@ bool HandleGlobalInputs( const InputEventPlus &input )
SCREENMAN->SystemMessage( RELOADED_METRICS_AND_TEXTURES ); SCREENMAN->SystemMessage( RELOADED_METRICS_AND_TEXTURES );
} }
/* If we're in screen test mode, reload the screen.
if( PREFSMAN->m_bScreenTestMode )
ResetGame( true );
else
*/
return true; return true;
} }
@@ -1450,7 +1433,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
#else #else
/* The default Windows message handler will capture the desktop window upon /* The default Windows message handler will capture the desktop window upon
* pressing PrntScrn, or will capture the foregroud with focus upon pressing * pressing PrntScrn, or will capture the foreground with focus upon pressing
* Alt+PrntScrn. Windows will do this whether or not we save a screenshot * Alt+PrntScrn. Windows will do this whether or not we save a screenshot
* ourself by dumping the frame buffer. */ * ourself by dumping the frame buffer. */
// "if pressing PrintScreen and not pressing Alt" // "if pressing PrintScreen and not pressing Alt"
@@ -1461,6 +1444,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
if( bDoScreenshot ) if( bDoScreenshot )
{ {
// If holding LShift save uncompressed, else save compressed // If holding LShift save uncompressed, else save compressed
// todo: allow for RShift -aj
bool bSaveCompressed = !INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) ); bool bSaveCompressed = !INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) );
RageTimer timer; RageTimer timer;
StepMania::SaveScreenshot( "Screenshots/", bSaveCompressed, false ); StepMania::SaveScreenshot( "Screenshots/", bSaveCompressed, false );