From 59b481eabae509288465cdb5d5bb08843c688df8 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 30 May 2010 22:49:44 -0500
Subject: [PATCH] some commenting and cleanup

---
 src/BPMDisplay.cpp     |  3 ++-
 src/DifficultyList.cpp |  4 ++--
 src/ScreenJukebox.cpp  |  4 ++--
 src/StepMania.cpp      | 24 ++++--------------------
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/BPMDisplay.cpp b/src/BPMDisplay.cpp
index c78e00a53d..cde764a5b8 100644
--- a/src/BPMDisplay.cpp
+++ b/src/BPMDisplay.cpp
@@ -74,6 +74,7 @@ void BPMDisplay::Update( float fDeltaTime )
 		{
 			m_fBPMFrom = -1;
 
+			// todo: allow themer to customize "xxx" string -aj
 			if( (bool)SHOW_QMARKS )
 				SetText( (RandomFloat(0,1)>0.90f) ? RString("xxx") : ssprintf("%03.0f",RandomFloat(0,999)) );
 			else
@@ -120,7 +121,7 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
 		if( MinBPM == MaxBPM )
 		{
 			if( MinBPM == -1 )
-				SetText( "..." ); // random
+				SetText( "..." ); // random (todo: let themer customize string -aj)
 			else
 				SetText( ssprintf("%i", MinBPM) );
 		}
diff --git a/src/DifficultyList.cpp b/src/DifficultyList.cpp
index fd0f9f3a4f..87eb1a2268 100644
--- a/src/DifficultyList.cpp
+++ b/src/DifficultyList.cpp
@@ -90,7 +90,7 @@ void StepsDisplayList::LoadFromNode( const XNode* pNode )
 int StepsDisplayList::GetCurrentRowIndex( PlayerNumber pn ) const
 {
 	Difficulty ClosestDifficulty = GAMESTATE->GetClosestShownDifficulty(pn);
-	
+
 	for( unsigned i=0; i<m_Rows.size(); i++ )
 	{
 		const Row &row = m_Rows[i];
@@ -106,7 +106,7 @@ int StepsDisplayList::GetCurrentRowIndex( PlayerNumber pn ) const
 				return i;
 		}
 	}
-	
+
 	return 0;
 }
 
diff --git a/src/ScreenJukebox.cpp b/src/ScreenJukebox.cpp
index e671e1b7b1..7ef24060e6 100644
--- a/src/ScreenJukebox.cpp
+++ b/src/ScreenJukebox.cpp
@@ -196,10 +196,10 @@ void ScreenJukebox::Init()
 	if( Benchmark )
 	{
 		/* Note that you also need to make sure you benchmark with the
-		 * same notes.  I use a copy of MaxU with only heavy notes included. */
+		 * same notes. I use a copy of MaxU with only heavy notes included. */
 		FOREACH_EnabledPlayer( p )
 		{
-			/* Lots and lots of arrows.  This might even bias to arrows a little
+			/* Lots and lots of arrows. This might even bias to arrows a little
 			 * too much. */
 			PO_GROUP_CALL( GAMESTATE->m_pPlayerState[p]->m_PlayerOptions, ModsLevel_Stage, Init );
 			PO_GROUP_ASSIGN( GAMESTATE->m_pPlayerState[p]->m_PlayerOptions, ModsLevel_Stage, m_fScrollSpeed, .25f );
diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index af38295170..04800cf803 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -827,16 +827,6 @@ void StepMania::ChangeCurrentGame( const Game* g )
 	ASSERT( ANNOUNCER );
 	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 );
 
 	RString sAnnouncer = PREFSMAN->m_sAnnouncer;
@@ -1353,7 +1343,6 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 	switch( input.MenuI )
 	{
 	case GAME_BUTTON_OPERATOR:
-
 		/* 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
 		 * (to prevent quitting without storing changes). */
@@ -1407,12 +1396,6 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 			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;
 	}
 
@@ -1450,9 +1433,9 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 
 #else
 	/* The default Windows message handler will capture the desktop window upon
-	 * pressing PrntScrn, or will capture the foregroud with focus upon pressing
-	 * Alt+PrntScrn.  Windows will do this whether or not we save a screenshot 
-	 * ourself by dumping the frame buffer.  */
+	 * pressing PrntScrn, or will capture the foreground with focus upon pressing
+	 * Alt+PrntScrn. Windows will do this whether or not we save a screenshot 
+	 * ourself by dumping the frame buffer. */
 	// "if pressing PrintScreen and not pressing Alt"
 		input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_PRTSC) && 
 		!INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LALT), &input.InputList) &&
@@ -1461,6 +1444,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 	if( bDoScreenshot )
 	{
 		// If holding LShift save uncompressed, else save compressed
+		// todo: allow for RShift -aj
 		bool bSaveCompressed = !INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) );
 		RageTimer timer;
 		StepMania::SaveScreenshot( "Screenshots/", bSaveCompressed, false );