changed format of score frame graphics

stepmania/Themes/default/Graphics/ScoreDisplayNormal frame.redir

@@ -0,0 +1 @@
+_blank

stepmania/Themes/default/Graphics/ScoreDisplayOni frame.redir

@@ -0,0 +1 @@
+_blank

stepmania/src/Player.cpp

@@ -290,6 +290,12 @@ void Player::Update( float fDeltaTime )
 
 void Player::DrawPrimitives()
 {
+	// don't draw CPU player in doubles.
+	if( GAMESTATE->GetCurrentStyleDef()->m_StyleType == StyleDef::ONE_PLAYER_TWO_CREDITS  &&
+		GAMESTATE->m_PlayerController[m_PlayerNumber] == PC_CPU )
+		return;
+
+
 	// Draw these below everything else.
 	m_ArrowBackdrop.Draw();
 	m_Combo.Draw();

stepmania/src/ScoreDisplayBattle.cpp

@@ -26,16 +26,11 @@ ScoreDisplayBattle::ScoreDisplayBattle()
 {
 	LOG->Trace( "ScoreDisplayBattle::ScoreDisplayBattle()" );
 
+	m_sprFrame.Load( THEME->GetPathToG("ScoreDisplayBattle frame") );
+	this->AddChild( &m_sprFrame );
+
 	for( int i=0; i<NUM_INVENTORY_SLOTS; i++ )
 	{
-		float fX = (float)SCALE(i,0.f,2.f,-60.f,60.f);
-
-		m_ItemFrame[i].Load( THEME->GetPathToG("ScoreDisplayBattle frames") );
-		m_ItemFrame[i].SetXY( ITEM_X(i), ITEM_Y(i) );
-		m_ItemFrame[i].StopAnimating();
-		m_ItemFrame[i].SetState( i );
-		this->AddChild( &m_ItemFrame[i] );
-
 		m_ItemIcon[i].SetXY( ITEM_X(i), ITEM_Y(i) );
 		m_ItemIcon[i].StopAnimating();
 		this->AddChild( &m_ItemIcon[i] );

stepmania/src/ScoreDisplayBattle.h

@@ -25,8 +25,8 @@ public:
 	virtual void Update( float fDelta );
 
 protected:
-	Sprite m_ItemFrame[NUM_INVENTORY_SLOTS];
-	Sprite m_ItemIcon[NUM_INVENTORY_SLOTS];
+	Sprite	m_sprFrame;
+	Sprite	m_ItemIcon[NUM_INVENTORY_SLOTS];
 
 	CString m_iLastSeenInventory[NUM_INVENTORY_SLOTS];
 };

stepmania/src/ScoreDisplayNormal.cpp

@@ -27,6 +27,9 @@ ScoreDisplayNormal::ScoreDisplayNormal()
 {
 	LOG->Trace( "ScoreDisplayNormal::ScoreDisplayNormal()" );
 
+	m_sprFrame.Load( THEME->GetPathToG("ScoreDisplayNormal frame") );
+	this->AddChild( &m_sprFrame );
+
 	// init the text
 	m_text.LoadFromNumbers( THEME->GetPathToN("ScoreDisplayNormal") );
 	m_text.EnableShadow( false );

stepmania/src/ScoreDisplayNormal.h

@@ -29,7 +29,8 @@ public:
 	virtual void SetText( CString s );
 
 protected:
-	BitmapText m_text;
+	Sprite		m_sprFrame;
+	BitmapText	m_text;
 
 	float m_fScore;			// the actual score
 	float m_fTrailingScore;	// what is displayed temporarily

stepmania/src/ScoreDisplayOni.cpp

@@ -23,6 +23,9 @@ ScoreDisplayOni::ScoreDisplayOni()
 {
 	LOG->Trace( "ScoreDisplayOni::ScoreDisplayOni()" );
 
+	m_sprFrame.Load( THEME->GetPathToG("ScoreDisplayOni frame") );
+	this->AddChild( &m_sprFrame );
+
 	// init the text
 	m_text.LoadFromNumbers( THEME->GetPathToN("ScoreDisplayOni") );
 	m_text.EnableShadow( false );

stepmania/src/ScoreDisplayOni.h

@@ -25,7 +25,8 @@ public:
 	virtual void Update( float fDelta );
 
 protected:
-	BitmapText m_text;
+	Sprite		m_sprFrame;
+	BitmapText	m_text;
 };
 
 #endif

stepmania/src/ScoreDisplayRave.cpp

@@ -22,6 +22,9 @@ ScoreDisplayRave::ScoreDisplayRave()
 {
 	LOG->Trace( "ScoreDisplayRave::ScoreDisplayRave()" );
 
+	m_sprFrame.Load( THEME->GetPathToG("ScoreDisplayRave frame") );
+	this->AddChild( &m_sprFrame );
+
 	m_textCurrentAttack.LoadFromFont( THEME->GetPathToF("Common normal") );
 	this->AddChild( &m_textCurrentAttack );
 }

stepmania/src/ScoreDisplayRave.h

@@ -25,7 +25,8 @@ public:
 	virtual void Update( float fDelta );
 
 protected:
-	BitmapText m_textCurrentAttack;
+	Sprite		m_sprFrame;
+	BitmapText	m_textCurrentAttack;
 
 	CString m_sLastSeenAttack;
 };

stepmania/src/ScreenPlayerOptions.cpp

@@ -43,7 +43,7 @@ OptionRow g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
 	OptionRow( "Acceler\n-ation",	"OFF","BOOST","BRAKE","WAVE","EXPAND","BOOMERANG" ),	
 	OptionRow( "Effect",			"OFF","DRUNK","DIZZY","MINI","FLIP","TORNADO" ),	
 	OptionRow( "Appear\n-ance",		"VISIBLE","HIDDEN","SUDDEN","STEALTH","BLINK", "R.VANISH" ),	
-	OptionRow( "Turn",				"OFF","MIRROR","LEFT","RIGHT","SHUFFLE","SUPER SHUFFLE" ),	
+	OptionRow( "Turn",				"OFF","MIRROR","LEFT","RIGHT","SHUFFLE","S.SHUFFLE" ),	
 	OptionRow( "Trans\n-form",		"OFF","LITTLE","WIDE","BIG","QUICK","SKIPPY" ),	
 	OptionRow( "Scroll",			"STANDARD","REVERSE" ),	
 	OptionRow( "Note\nSkin",		"" ),