From 8d7733c6f2954d43a9eb062893a4a38c041378e4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 26 Aug 2005 21:12:48 +0000 Subject: [PATCH] removing GetMetricC --- stepmania/src/ScreenNameEntry.cpp | 25 +++++++++++------------- stepmania/src/ScreenNetEvaluation.cpp | 4 ++-- stepmania/src/ScreenNetSelectBase.cpp | 2 +- stepmania/src/ScreenPackages.cpp | 2 +- stepmania/src/ScreenSelectDifficulty.cpp | 11 ++++++----- stepmania/src/ScreenSelectStyle.cpp | 6 +++--- 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index 0071d3031b..2175cd3ccb 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -33,8 +33,8 @@ #define CHARS_ZOOM_SMALL THEME->GetMetricF("ScreenNameEntry","CharsZoomSmall") #define CHARS_ZOOM_LARGE THEME->GetMetricF("ScreenNameEntry","CharsZoomLarge") #define CHARS_SPACING_Y THEME->GetMetricF("ScreenNameEntry","CharsSpacingY") -#define SCROLLING_CHARS_COLOR THEME->GetMetricC("ScreenNameEntry","ScrollingCharsColor") -#define SELECTED_CHARS_COLOR THEME->GetMetricC("ScreenNameEntry","SelectedCharsColor") +#define SCROLLING_CHARS_COMMAND THEME->GetMetricA("ScreenNameEntry","ScrollingCharsCommand") +#define SELECTED_CHARS_COMMAND THEME->GetMetricA("ScreenNameEntry","SelectedCharsCommand") #define GRAY_ARROWS_Y THEME->GetMetricF("ScreenNameEntry","ReceptorArrowsY") #define NUM_CHARS_TO_DRAW_BEHIND THEME->GetMetricI("ScreenNameEntry","NumCharsToDrawBehind") #define NUM_CHARS_TO_DRAW_TOTAL THEME->GetMetricI("ScreenNameEntry","NumCharsToDrawTotal") @@ -48,8 +48,6 @@ float g_fCharsZoomSmall; float g_fCharsZoomLarge; float g_fCharsSpacingY; -RageColor g_ScrollingCharsColor; -RageColor g_SelectedCharsColor; float g_fReceptorArrowsY; int g_iNumCharsToDrawBehind; int g_iNumCharsToDrawTotal; @@ -98,8 +96,6 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) g_fCharsZoomSmall = CHARS_ZOOM_SMALL; g_fCharsZoomLarge = CHARS_ZOOM_LARGE; g_fCharsSpacingY = CHARS_SPACING_Y; - g_ScrollingCharsColor = SCROLLING_CHARS_COLOR; - g_SelectedCharsColor = SELECTED_CHARS_COLOR; g_fReceptorArrowsY = GRAY_ARROWS_Y; g_iNumCharsToDrawBehind = NUM_CHARS_TO_DRAW_BEHIND; g_iNumCharsToDrawTotal = NUM_CHARS_TO_DRAW_TOTAL; @@ -135,13 +131,14 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) FOREACH_PlayerNumber( p ) { GAMESTATE->GetRankingFeats( p, aFeats[p] ); - m_bStillEnteringName[p] = aFeats[p].size()>0; + GAMESTATE->JoinPlayer( p ); + m_bStillEnteringName[p] = true;//aFeats[p].size()>0; } if( !AnyStillEntering() ) { /* Nobody made a high score. */ - HandleScreenMessage( SM_GoToNextScreen ); + PostScreenMessage( SM_GoToNextScreen, 0 ); return; } @@ -214,7 +211,7 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) m_textSelectedChars[p][t].LoadFromFont( THEME->GetPathF("ScreenNameEntry","letters") ); m_textSelectedChars[p][t].SetX( ColX ); m_textSelectedChars[p][t].SetY( GRAY_ARROWS_Y ); - m_textSelectedChars[p][t].SetDiffuse( g_SelectedCharsColor ); + m_textSelectedChars[p][t].RunCommands( SELECTED_CHARS_COMMAND ); m_textSelectedChars[p][t].SetZoom( CHARS_ZOOM_LARGE ); if( t < (int)m_sSelectedName[p].length() ) m_textSelectedChars[p][t].SetText( m_sSelectedName[p].substr(t,1) ); @@ -223,7 +220,7 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) m_textScrollingChars[p][t].LoadFromFont( THEME->GetPathF("ScreenNameEntry","letters") ); m_textScrollingChars[p][t].SetX( ColX ); m_textScrollingChars[p][t].SetY( GRAY_ARROWS_Y ); - m_textScrollingChars[p][t].SetDiffuse( g_ScrollingCharsColor ); + m_textScrollingChars[p][t].RunCommands( SCROLLING_CHARS_COMMAND ); //this->AddChild( &m_textScrollingChars[p][t] ); // draw these manually } @@ -326,12 +323,12 @@ void ScreenNameEntry::DrawPrimitives() if( iCharIndex==iClosestIndex ) fZoom = SCALE(fabsf(GetClosestCharYOffset(m_fFakeBeat)),0,0.5f,g_fCharsZoomLarge,g_fCharsZoomSmall); m_textScrollingChars[p][t].SetZoom(fZoom); - RageColor color = g_ScrollingCharsColor; + float fAlpha = m_textScrollingChars[p][t].GetDiffuseAlpha(); if( i==0 ) - color.a *= SCALE(GetClosestCharYOffset(m_fFakeBeat),-0.5f,0.f,0.f,1.f); + fAlpha *= SCALE(GetClosestCharYOffset(m_fFakeBeat),-0.5f,0.f,0.f,1.f); if( i==g_iNumCharsToDrawTotal-1 ) - color.a *= SCALE(GetClosestCharYOffset(m_fFakeBeat),0.f,0.5f,1.f,0.f); - m_textScrollingChars[p][t].SetDiffuse( color ); + fAlpha *= SCALE(GetClosestCharYOffset(m_fFakeBeat),0.f,0.5f,1.f,0.f); + m_textScrollingChars[p][t].SetDiffuseAlpha( fAlpha ); m_textScrollingChars[p][t].Draw(); } fY += g_fCharsSpacingY; diff --git a/stepmania/src/ScreenNetEvaluation.cpp b/stepmania/src/ScreenNetEvaluation.cpp index c7985f4e6f..c90e0fa9c8 100644 --- a/stepmania/src/ScreenNetEvaluation.cpp +++ b/stepmania/src/ScreenNetEvaluation.cpp @@ -10,7 +10,7 @@ const int NUM_SCORE_DIGITS = 9; #define USERSBG_WIDTH THEME->GetMetricF("ScreenNetEvaluation","UsersBGWidth") #define USERSBG_HEIGHT THEME->GetMetricF("ScreenNetEvaluation","UsersBGHeight") -#define USERSBG_COLOR THEME->GetMetricC("ScreenNetEvaluation","UsersBGColor") +#define USERSBG_COMMAND THEME->GetMetricA("ScreenNetEvaluation","UsersBGCommand") #define USERDX THEME->GetMetricF("ScreenNetEvaluation","UserDX") #define USERDY THEME->GetMetricF("ScreenNetEvaluation","UserDY") @@ -43,7 +43,7 @@ void ScreenNetEvaluation::Init() m_rectUsersBG.SetWidth( USERSBG_WIDTH ); m_rectUsersBG.SetHeight( USERSBG_HEIGHT ); - m_rectUsersBG.SetDiffuse( USERSBG_COLOR ); + m_rectUsersBG.RunCommands( USERSBG_COMMAND ); m_rectUsersBG.SetName( "UsersBG" ); ON_COMMAND( m_rectUsersBG ); diff --git a/stepmania/src/ScreenNetSelectBase.cpp b/stepmania/src/ScreenNetSelectBase.cpp index 36a0013d42..5070b77859 100644 --- a/stepmania/src/ScreenNetSelectBase.cpp +++ b/stepmania/src/ScreenNetSelectBase.cpp @@ -256,7 +256,7 @@ void ScreenNetSelectBase::UpdateUsers() void UtilSetQuadInit( Actor& actor, const CString &sClassName ) { ActorUtil::SetXYAndOnCommand( actor, sClassName ); - actor.SetDiffuse( THEME->GetMetricC( sClassName, actor.GetName() + "Color" ) ); + actor.RunCommands( THEME->GetMetricA( sClassName, actor.GetName() + "Command" ) ); actor.SetWidth( THEME->GetMetricF( sClassName, actor.GetName() + "Width" ) ); actor.SetHeight( THEME->GetMetricF( sClassName, actor.GetName() + "Height" ) ); } diff --git a/stepmania/src/ScreenPackages.cpp b/stepmania/src/ScreenPackages.cpp index 81c1ffac30..98cd87cfbe 100644 --- a/stepmania/src/ScreenPackages.cpp +++ b/stepmania/src/ScreenPackages.cpp @@ -95,7 +95,7 @@ void ScreenPackages::Init() m_sprDL.Load( THEME->GetPathG( m_sName, "Download" ) ); SET_XY_AND_ON_COMMAND( m_sprDL ); this->AddChild( &m_sprDL ); - m_sprDL.SetDiffuse( THEME->GetMetricC( m_sName, "DownloadProgressColor" ) ); + m_sprDL.RunCommands( THEME->GetMetricA( m_sName, "DownloadProgressCommand" ) ); m_textStatus.LoadFromFont( THEME->GetPathF(m_sName,"default") ); m_textStatus.SetShadowLength( 0 ); diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index 0c23c576cf..d91f58dceb 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -23,7 +23,8 @@ #define SHADOW_LENGTH_X THEME->GetMetricF(m_sName,"ShadowLengthX") #define SHADOW_LENGTH_Y THEME->GetMetricF(m_sName,"ShadowLengthY") #define OK_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"OKChooseCommand") -#define DISABLED_COLOR THEME->GetMetricC(m_sName,"DisabledColor") +#define ENABLED_COMMAND THEME->GetMetricA(m_sName,"EnabledCommand") +#define DISABLED_COMMAND THEME->GetMetricA(m_sName,"DisabledCommand") #define IGNORED_ELEMENT_COMMAND THEME->GetMetricA(m_sName,"IgnoredElementOnCommand") @@ -162,13 +163,13 @@ void ScreenSelectDifficulty::UpdateSelectableChoices() * able to see the glow. */ if( m_GameCommands[page][i].IsPlayable() ) { - m_sprInfo[page][i].SetDiffuse( RageColor(1,1,1,1) ); - m_sprPicture[page][i].SetDiffuse( RageColor(1,1,1,1) ); + m_sprInfo[page][i].RunCommands( ENABLED_COMMAND ); + m_sprPicture[page][i].RunCommands( ENABLED_COMMAND ); } else { - m_sprInfo[page][i].SetDiffuse( DISABLED_COLOR ); - m_sprPicture[page][i].SetDiffuse( DISABLED_COLOR ); + m_sprInfo[page][i].RunCommands( DISABLED_COMMAND ); + m_sprPicture[page][i].RunCommands( DISABLED_COMMAND ); } } } diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index e710bbbf6c..b9bd7fd29a 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -16,7 +16,7 @@ #define ICON_GAIN_FOCUS_COMMAND THEME->GetMetricA(m_sName,"IconGainFocusCommand") #define ICON_LOSE_FOCUS_COMMAND THEME->GetMetricA(m_sName,"IconLoseFocusCommand") -#define DISABLED_COLOR THEME->GetMetricC(m_sName,"DisabledColor") +#define DISABLED_COMMAND THEME->GetMetricA(m_sName,"DisabledCommand") REGISTER_SCREEN_CLASS( ScreenSelectStyle ); @@ -227,8 +227,8 @@ void ScreenSelectStyle::UpdateSelectableChoices() } else { - m_sprIcon[i].SetDiffuse( DISABLED_COLOR ); - m_textIcon[i].SetDiffuse( DISABLED_COLOR ); + m_sprIcon[i].RunCommands( DISABLED_COMMAND ); + m_textIcon[i].RunCommands( DISABLED_COMMAND ); } }