fix "illegal conversion; more than one user-defined conversion has been implicitly applied"

This commit is contained in:
Glenn Maynard
2006-01-12 19:40:41 +00:00
parent 9fc5844357
commit 2af53bb703
+2 -2
View File
@@ -773,11 +773,11 @@ CString GameState::GetPlayerDisplayName( PlayerNumber pn ) const
if( !PROFILEMAN->GetPlayerName(pn).empty() ) if( !PROFILEMAN->GetPlayerName(pn).empty() )
return PROFILEMAN->GetPlayerName(pn); return PROFILEMAN->GetPlayerName(pn);
else else
return *pDefaultNames[pn]; return pDefaultNames[pn]->GetValue();
} }
else else
{ {
return CPU; return CPU.GetValue();
} }
} }