From f574c4782ac9723de6b8fd7a4db367b3f8918225 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 5 May 2003 06:48:20 +0000 Subject: [PATCH] changed format of score frame graphics --- .../default/Graphics/ScoreDisplayNormal frame.redir | 1 + .../default/Graphics/ScoreDisplayOni frame.redir | 1 + stepmania/src/Player.cpp | 6 ++++++ stepmania/src/ScoreDisplayBattle.cpp | 11 +++-------- stepmania/src/ScoreDisplayBattle.h | 4 ++-- stepmania/src/ScoreDisplayNormal.cpp | 3 +++ stepmania/src/ScoreDisplayNormal.h | 3 ++- stepmania/src/ScoreDisplayOni.cpp | 3 +++ stepmania/src/ScoreDisplayOni.h | 3 ++- stepmania/src/ScoreDisplayRave.cpp | 3 +++ stepmania/src/ScoreDisplayRave.h | 3 ++- stepmania/src/ScreenPlayerOptions.cpp | 2 +- 12 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 stepmania/Themes/default/Graphics/ScoreDisplayNormal frame.redir create mode 100644 stepmania/Themes/default/Graphics/ScoreDisplayOni frame.redir diff --git a/stepmania/Themes/default/Graphics/ScoreDisplayNormal frame.redir b/stepmania/Themes/default/Graphics/ScoreDisplayNormal frame.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScoreDisplayNormal frame.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScoreDisplayOni frame.redir b/stepmania/Themes/default/Graphics/ScoreDisplayOni frame.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScoreDisplayOni frame.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 81eac1c399..2a7a4fc61f 100644 --- a/stepmania/src/Player.cpp +++ b/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(); diff --git a/stepmania/src/ScoreDisplayBattle.cpp b/stepmania/src/ScoreDisplayBattle.cpp index 8b99d2d2d4..b3d33b3de0 100644 --- a/stepmania/src/ScoreDisplayBattle.cpp +++ b/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; iGetPathToG("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] ); diff --git a/stepmania/src/ScoreDisplayBattle.h b/stepmania/src/ScoreDisplayBattle.h index ebcd081d4e..107fe99b75 100644 --- a/stepmania/src/ScoreDisplayBattle.h +++ b/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]; }; diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp index 405b748865..dcd5ba5fe6 100644 --- a/stepmania/src/ScoreDisplayNormal.cpp +++ b/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 ); diff --git a/stepmania/src/ScoreDisplayNormal.h b/stepmania/src/ScoreDisplayNormal.h index d8cbd75c8a..77e188b7fc 100644 --- a/stepmania/src/ScoreDisplayNormal.h +++ b/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 diff --git a/stepmania/src/ScoreDisplayOni.cpp b/stepmania/src/ScoreDisplayOni.cpp index 6a87ff7f6b..3844315df5 100644 --- a/stepmania/src/ScoreDisplayOni.cpp +++ b/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 ); diff --git a/stepmania/src/ScoreDisplayOni.h b/stepmania/src/ScoreDisplayOni.h index 13854aa5ff..728efb1b68 100644 --- a/stepmania/src/ScoreDisplayOni.h +++ b/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 diff --git a/stepmania/src/ScoreDisplayRave.cpp b/stepmania/src/ScoreDisplayRave.cpp index e8882202a8..c0c2024eae 100644 --- a/stepmania/src/ScoreDisplayRave.cpp +++ b/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 ); } diff --git a/stepmania/src/ScoreDisplayRave.h b/stepmania/src/ScoreDisplayRave.h index 100981ca0e..b16579a51b 100644 --- a/stepmania/src/ScoreDisplayRave.h +++ b/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; }; diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 81b2e70a73..39c55f3833 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/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", "" ),