changes made from 0.95 through 0.97

stepmania/src/BitmapText.h

@@ -27,30 +27,24 @@ public:
 	BitmapText();
 
 	bool LoadFromFontName( CString sFontName );
-	void SetText( CString sText ) { m_sText = sText; };
-	CString GetText() { return m_sText; };
+	void SetText( CString sText );
+	CString GetText();
 
 	bool LoadFontWidths( CString sFilePath );
-	//float GetWidthZoomed();
-
-//	void SetTopColor( D3DXCOLOR new_color ) { m_colorTop = new_color; };
-//	void SetBottomColor( D3DXCOLOR new_color ) { m_colorBottom = new_color; };
-//	void SetColor( D3DXCOLOR new_color ) { SetTopColor(new_color); SetBottomColor(new_color); };
 
 	void Draw();
 
-	float GetWidthInSourcePixels();	// in logical, pre-scaled units
+	float GetWidestLineWidthInSourcePixels();	// in logical, pre-zoomed units
+	float GetLineWidthInSourcePixels( int iLineNo );
 
 protected:
 	bool LoadCharWidths( CString sWidthFilePath );
 
 	CString m_sFontName;
 	float m_fCharWidthsInSourcePixels[NUM_CHARS];	// in soure coordinate space
-
-	CString	m_sText;	// the string that the font is displaying
-//	D3DXCOLOR	m_colorTop;
-//	D3DXCOLOR	m_colorBottom;
-//	bool	m_bHasShadow;
+	
+	CStringArray	m_sTextLines;
+	//CArray<float,float>	m_fLineWidths;
 };