From bc997f81d4606e2c4f66bee368efdf1eec3a2682 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 19 Feb 2007 09:32:07 +0000 Subject: [PATCH] BitmapText::Rainbow -> RainbowScroll to fix naming confict with Actor::rainbow --- stepmania/Themes/default/metrics.ini | 2 +- stepmania/src/BitmapText.cpp | 8 +++++--- stepmania/src/BitmapText.h | 4 ++-- stepmania/src/GroupList.cpp | 4 ++-- stepmania/src/MusicWheelItem.cpp | 2 +- stepmania/src/ScreenNetEvaluation.cpp | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index e4d5a5aeb6..a258fcdd13 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1963,7 +1963,7 @@ SectionY=0 SectionOnCommand=zoom,1.0;maxwidth,200 RouletteX=-30 RouletteY=0 -RouletteOnCommand=Zoom,1.0;rainbow,true +RouletteOnCommand=Zoom,1.0;rainbowscroll,true CourseNameX=-120 CourseNameY=0 CourseNameOnCommand=shadowlength,0;zoom,1.3;horizAlign,left;maxwidth,200 diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index 78314e402f..58f8bb3983 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -44,7 +44,7 @@ BitmapText::BitmapText() m_pFont = NULL; - m_bRainbow = false; + m_bRainbowScroll = false; m_bJitter = false; m_iWrapWidthPixels = -1; @@ -77,7 +77,7 @@ BitmapText &BitmapText::operator =( const BitmapText &cpy ) CPY( m_iWrapWidthPixels ); CPY( m_fMaxWidth ); CPY( m_fMaxHeight ); - CPY( m_bRainbow ); + CPY( m_bRainbowScroll ); CPY( m_bJitter ); CPY( m_iVertSpacing ); CPY( m_aVertices ); @@ -539,7 +539,7 @@ void BitmapText::DrawPrimitives() // // render the diffuse pass // - if( m_bRainbow ) + if( m_bRainbowScroll ) { int color_index = int(RageTimer::GetTimeSinceStartFast() / 0.200) % NUM_RAINBOW_COLORS; for( unsigned i=0; iSetText( s ); return 0; } + static int rainbowscroll( T* p, lua_State *L ) { p->SetRainbowScroll( BArg(1) ); return 0; } static int jitter( T* p, lua_State *L ) { p->SetJitter( BArg(1) ); return 0; } static int GetText( T* p, lua_State *L ) { lua_pushstring( L, p->GetText() ); return 1; } @@ -913,6 +914,7 @@ public: ADD_METHOD( maxheight ); ADD_METHOD( vertspacing ); ADD_METHOD( settext ); + ADD_METHOD( rainbowscroll ); ADD_METHOD( jitter ); ADD_METHOD( GetText ); } diff --git a/stepmania/src/BitmapText.h b/stepmania/src/BitmapText.h index ccfc412f79..caa91b95bb 100644 --- a/stepmania/src/BitmapText.h +++ b/stepmania/src/BitmapText.h @@ -31,7 +31,7 @@ public: virtual bool EarlyAbortDraw() const; virtual void DrawPrimitives(); - void SetRainbow( bool b ) { m_bRainbow = b; } + void SetRainbowScroll( bool b ) { m_bRainbowScroll = b; } void SetJitter( bool b ) { m_bJitter = b; } void SetHorizAlign( HorizAlign ha ); @@ -58,7 +58,7 @@ protected: int m_iWrapWidthPixels; // -1 = no wrap float m_fMaxWidth; float m_fMaxHeight; - bool m_bRainbow; + bool m_bRainbowScroll; bool m_bJitter; int m_iVertSpacing; diff --git a/stepmania/src/GroupList.cpp b/stepmania/src/GroupList.cpp index 644934fe35..edb3e97536 100644 --- a/stepmania/src/GroupList.cpp +++ b/stepmania/src/GroupList.cpp @@ -78,11 +78,11 @@ void GroupList::Load( const vector& asGroupNames ) if( i == 0 ) { - label->SetRainbow( true ); + label->SetRainbowScroll( true ); } else { - label->SetRainbow( false ); + label->SetRainbowScroll( false ); label->SetDiffuse( SONGMAN->GetSongGroupColor(asGroupNames[i]) ); } diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp index da97cd7d3b..7c39a6ed0b 100644 --- a/stepmania/src/MusicWheelItem.cpp +++ b/stepmania/src/MusicWheelItem.cpp @@ -201,7 +201,7 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWIBD, int bt->SetText( sDisplayName, sTranslitName ); bt->SetDiffuse( data->m_color ); - bt->SetRainbow( false ); + bt->SetRainbowScroll( false ); bt->SetVisible( true ); break; } diff --git a/stepmania/src/ScreenNetEvaluation.cpp b/stepmania/src/ScreenNetEvaluation.cpp index 9ae039523c..2672519011 100644 --- a/stepmania/src/ScreenNetEvaluation.cpp +++ b/stepmania/src/ScreenNetEvaluation.cpp @@ -147,9 +147,9 @@ void ScreenNetEvaluation::HandleScreenMessage( const ScreenMessage SM ) m_textUsers[i].SetText( NSMAN->m_PlayerNames[NSMAN->m_EvalPlayerData[i].name] ); if ( NSMAN->m_EvalPlayerData[i].grade < Grade_Tier03 ) //Yes, hardcoded (I'd like to leave it that way) - m_textUsers[i].SetRainbow( true ); + m_textUsers[i].SetRainbowScroll( true ); else - m_textUsers[i].SetRainbow( false ); + m_textUsers[i].SetRainbowScroll( false ); ON_COMMAND( m_textUsers[i] ); LOG->Trace("SMNETCheckpoint%d",i); }