fix ambiguous ?: types

2004-08-06 21:01:28 +00:00
parent 6c56149963
commit 0c4f092fd3
19 changed files with 29 additions and 28 deletions
@@ -51,7 +51,7 @@ void OptionIcon::Load( PlayerNumber pn, CString sText, bool bHeader )
 	int iState = pn*3 + (bHeader?0:(bVacant?1:2));
 	m_spr.SetState( iState );

-	m_text.SetText( bHeader ? "" : sText );
+	m_text.SetText( bHeader ? CString("") : sText );
 	m_text.SetZoom( TEXT_ZOOM );
 	m_text.CropToWidth( TEXT_WIDTH );
 }