fix "illegal conversion; more than one user-defined conversion has been implicitly applied"
This commit is contained in:
@@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user