BitmapText::Rainbow -> RainbowScroll to fix naming confict with Actor::rainbow

2007-02-19 09:32:07 +00:00
parent 599db61b62
commit bc997f81d4
6 changed files with 13 additions and 11 deletions
@@ -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;